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

Commit bc178237 authored by Liu Bo's avatar Liu Bo Committed by Chris Mason
Browse files

Btrfs: fix missing inherited flag in rename 



When we move a file into a directory with compression flag, we need to
inherite BTRFS_INODE_COMPRESS and clear BTRFS_INODE_NOCOMPRESS as well.
But if we move a file into a directory without compression flag, we need
to clear both of them.

It is the way how our setflags deals with compression flag, so keep
the same behaviour here.

Signed-off-by: default avatarLiu Bo <liubo2009@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent acbcabd2

fs/btrfs/inode.c

+6 −3
Original line number Diff line number Diff line
@@ -7122,10 +7122,13 @@ static void fixup_inode_flags(struct inode *dir, struct inode *inode) 
	else

		b_inode->flags &= ~BTRFS_INODE_NODATACOW;



	if (b_dir->flags & BTRFS_INODE_COMPRESS)

	if (b_dir->flags & BTRFS_INODE_COMPRESS) {

		b_inode->flags |= BTRFS_INODE_COMPRESS;

	else

		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,