Btrfs: do not change inode flags in rename

Before we forced to change a file's NOCOW and COMPRESS flag due to
the parent directory's, but this ends up a bad idea, because it
confuses end users a lot about file's NOCOW status, eg. if someone
change a file to NOCOW via 'chattr' and then rename it in the current
directory which is without NOCOW attribute, the file will lose the
NOCOW flag silently.

This diables 'change flags in rename', so from now on we'll only
inherit flags from the parent directory on creation stage while in
other places we can use 'chattr' to set NOCOW or COMPRESS flags.

Reported-by: Marios Titas <redneb8888@gmail.com>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 14c82cdbb69637ff82923992ac1aaee27ad50911..be09654e11b901ddd2bbf3163f74f29c609503de 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8060,29 +8060,6 @@ static int btrfs_getattr(struct vfsmount *mnt,
        return 0;
 }
 
-/*
- * If a file is moved, it will inherit the cow and compression flags of the new
- * directory.
- */
-static void fixup_inode_flags(struct inode *dir, struct inode *inode)
-{
-       struct btrfs_inode *b_dir = BTRFS_I(dir);
-       struct btrfs_inode *b_inode = BTRFS_I(inode);
-
-       if (b_dir->flags & BTRFS_INODE_NODATACOW)
-               b_inode->flags |= BTRFS_INODE_NODATACOW;
-       else
-               b_inode->flags &= ~BTRFS_INODE_NODATACOW;
-
-       if (b_dir->flags & BTRFS_INODE_COMPRESS) {
-               b_inode->flags |= BTRFS_INODE_COMPRESS;
-               b_inode->flags &= ~BTRFS_INODE_NOCOMPRESS;
-       } else {
-               b_inode->flags &= ~(BTRFS_INODE_COMPRESS |
-                                   BTRFS_INODE_NOCOMPRESS);
-       }
-}
-
 static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                           struct inode *new_dir, struct dentry *new_dentry)
 {
@@ -8248,8 +8225,6 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                }
        }
 
-       fixup_inode_flags(new_dir, old_inode);
-
        ret = btrfs_add_link(trans, new_dir, old_inode,
                             new_dentry->d_name.name,
                             new_dentry->d_name.len, 0, index);