aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-06-02 17:38:30 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 16:47:44 -0400
commita4ffdde6e56fdf8c34ddadc2674d6eb978083369 (patch)
tree0fa07df92d804cb7d0482135195e4835cb16403a /fs/btrfs/inode.c
parentb5fc510c48f631882ccec3c0f02a25d5b67de09f (diff)
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: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7f9e0536db1a..95eac0116963 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3860,7 +3860,7 @@ again:
3860 p = &parent->rb_right; 3860 p = &parent->rb_right;
3861 else { 3861 else {
3862 WARN_ON(!(entry->vfs_inode.i_state & 3862 WARN_ON(!(entry->vfs_inode.i_state &
3863 (I_WILL_FREE | I_FREEING | I_CLEAR))); 3863 (I_WILL_FREE | I_FREEING)));
3864 rb_erase(parent, &root->inode_tree); 3864 rb_erase(parent, &root->inode_tree);
3865 RB_CLEAR_NODE(parent); 3865 RB_CLEAR_NODE(parent);
3866 spin_unlock(&root->inode_lock); 3866 spin_unlock(&root->inode_lock);