Btrfs: do not change inode flags in rename (8c4ce81e) · Commits · 戴 / test

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>

fs/btrfs/inode.c

+0 −25

Original line number	Diff line number	Diff line
		@@ -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);

Admin message