Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f8c19fd authored by Dave Chinner's avatar Dave Chinner Committed by Al Viro
Browse files

inode: remove iprune_sem 



Now that we have per-sb shrinkers with a lifecycle that is a subset
of the superblock lifecycle and can reliably detect a filesystem
being unmounted, there is not longer any race condition for the
iprune_sem to protect against. Hence we can remove it.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b0d40c92

fs/inode.c

+0 −21
Original line number Diff line number Diff line
@@ -67,17 +67,6 @@ static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); 
__cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);

__cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_wb_list_lock);



/*

 * iprune_sem provides exclusion between the icache shrinking and the

 * umount path.

 *

 * We don't actually need it to protect anything in the umount path,

 * but only need to cycle through it to make sure any inode that

 * prune_icache_sb took off the LRU list has been fully torn down by the

 * time we are past evict_inodes.

 */

static DECLARE_RWSEM(iprune_sem);



/*

 * Empty aops. Can be used for the cases where the user does not

 * define any of the address_space operations.
@@ -542,14 +531,6 @@ void evict_inodes(struct super_block *sb) 
	spin_unlock(&inode_sb_list_lock);



	dispose_list(&dispose);



	/*

	 * Cycle through iprune_sem to make sure any inode that prune_icache_sb

	 * moved off the list before we took the lock has been fully torn

	 * down.

	 */

	down_write(&iprune_sem);

	up_write(&iprune_sem);

}



/**
@@ -635,7 +616,6 @@ void prune_icache_sb(struct super_block *sb, int nr_to_scan) 
	int nr_scanned;

	unsigned long reap = 0;



	down_read(&iprune_sem);

	spin_lock(&sb->s_inode_lru_lock);

	for (nr_scanned = nr_to_scan; nr_scanned >= 0; nr_scanned--) {

		struct inode *inode;
@@ -711,7 +691,6 @@ void prune_icache_sb(struct super_block *sb, int nr_to_scan) 
	spin_unlock(&sb->s_inode_lru_lock);



	dispose_list(&freeable);

	up_read(&iprune_sem);

}



static void __wait_on_freeing_inode(struct inode *inode);