Commit a4ffdde6 authored by Al Viro's avatar Al Viro
Browse files

simplify checks for I_CLEAR/I_FREEING 



add I_CLEAR instead of replacing I_FREEING with it.  I_CLEAR is
equivalent to I_FREEING for almost all code looking at either;
it's there to keep track of having called clear_inode() exactly
once per inode lifetime, at some point after having set I_FREEING.
I_CLEAR and I_FREEING never get set at the same time with the
current code, so we can switch to setting i_flags to I_FREEING | I_CLEAR
instead of I_CLEAR without loss of information.  As the result of
such change, checks become simpler and the amount of code that needs
to know about I_CLEAR shrinks a lot.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b5fc510c

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3860,7 +3860,7 @@ again: 
			p = &parent->rb_right;

		else {

			WARN_ON(!(entry->vfs_inode.i_state &

				  (I_WILL_FREE | I_FREEING | I_CLEAR)));

				  (I_WILL_FREE | I_FREEING)));

			rb_erase(parent, &root->inode_tree);

			RB_CLEAR_NODE(parent);

			spin_unlock(&root->inode_lock);

fs/drop_caches.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused) 


	spin_lock(&inode_lock);

	list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {

		if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE|I_NEW))

		if (inode->i_state & (I_FREEING|I_WILL_FREE|I_NEW))

			continue;

		if (inode->i_mapping->nrpages == 0)

			continue;

fs/fs-writeback.c

+4 −4
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ writeback_single_inode(struct inode *inode, struct writeback_control *wbc) 


	spin_lock(&inode_lock);

	inode->i_state &= ~I_SYNC;

	if (!(inode->i_state & (I_FREEING | I_CLEAR))) {

	if (!(inode->i_state & I_FREEING)) {

		if ((inode->i_state & I_DIRTY_PAGES) && wbc->for_kupdate) {

			/*

			 * More pages get dirtied by a fast dirtier.
@@ -499,7 +499,7 @@ static int writeback_sb_inodes(struct super_block *sb, struct bdi_writeback *wb, 
		if (inode_dirtied_after(inode, wbc->wb_start))

			return 1;



		BUG_ON(inode->i_state & (I_FREEING | I_CLEAR));

		BUG_ON(inode->i_state & I_FREEING);

		__iget(inode);

		pages_skipped = wbc->pages_skipped;

		writeback_single_inode(inode, wbc);
@@ -935,7 +935,7 @@ void __mark_inode_dirty(struct inode *inode, int flags) 
			if (hlist_unhashed(&inode->i_hash))

				goto out;

		}

		if (inode->i_state & (I_FREEING|I_CLEAR))

		if (inode->i_state & I_FREEING)

			goto out;



		/*
@@ -1001,7 +1001,7 @@ static void wait_sb_inodes(struct super_block *sb) 
	list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {

		struct address_space *mapping;



		if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE|I_NEW))

		if (inode->i_state & (I_FREEING|I_WILL_FREE|I_NEW))

			continue;

		mapping = inode->i_mapping;

		if (mapping->nrpages == 0)

fs/gfs2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int iget_skip_test(struct inode *inode, void *opaque) 
	struct gfs2_skip_data *data = opaque;



	if (ip->i_no_addr == data->no_addr) {

		if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE)){

		if (inode->i_state & (I_FREEING|I_WILL_FREE)){

			data->skipped = 1;

			return 0;

		}

fs/inode.c

+8 −8
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ void clear_inode(struct inode *inode) 
		bd_forget(inode);

	if (S_ISCHR(inode->i_mode) && inode->i_cdev)

		cd_forget(inode);

	inode->i_state = I_CLEAR;

	inode->i_state = I_FREEING | I_CLEAR;

}

EXPORT_SYMBOL(clear_inode);
@@ -553,7 +553,7 @@ repeat: 
			continue;

		if (!test(inode, data))

			continue;

		if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE)) {

		if (inode->i_state & (I_FREEING|I_WILL_FREE)) {

			__wait_on_freeing_inode(inode);

			goto repeat;

		}
@@ -578,7 +578,7 @@ repeat: 
			continue;

		if (inode->i_sb != sb)

			continue;

		if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE)) {

		if (inode->i_state & (I_FREEING|I_WILL_FREE)) {

			__wait_on_freeing_inode(inode);

			goto repeat;

		}
@@ -840,7 +840,7 @@ EXPORT_SYMBOL(iunique); 
struct inode *igrab(struct inode *inode)

{

	spin_lock(&inode_lock);

	if (!(inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE)))

	if (!(inode->i_state & (I_FREEING|I_WILL_FREE)))

		__iget(inode);

	else

		/*
@@ -1089,7 +1089,7 @@ int insert_inode_locked(struct inode *inode) 
				continue;

			if (old->i_sb != sb)

				continue;

			if (old->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE))

			if (old->i_state & (I_FREEING|I_WILL_FREE))

				continue;

			break;

		}
@@ -1128,7 +1128,7 @@ int insert_inode_locked4(struct inode *inode, unsigned long hashval, 
				continue;

			if (!test(old, data))

				continue;

			if (old->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE))

			if (old->i_state & (I_FREEING|I_WILL_FREE))

				continue;

			break;

		}
@@ -1218,7 +1218,7 @@ void generic_delete_inode(struct inode *inode) 
	hlist_del_init(&inode->i_hash);

	spin_unlock(&inode_lock);

	wake_up_inode(inode);

	BUG_ON(inode->i_state != I_CLEAR);

	BUG_ON(inode->i_state != (I_FREEING | I_CLEAR));

	destroy_inode(inode);

}

EXPORT_SYMBOL(generic_delete_inode);
@@ -1322,7 +1322,7 @@ static inline void iput_final(struct inode *inode) 
void iput(struct inode *inode)

{

	if (inode) {

		BUG_ON(inode->i_state == I_CLEAR);

		BUG_ON(inode->i_state & I_CLEAR);



		if (atomic_dec_and_lock(&inode->i_count, &inode_lock))

			iput_final(inode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE