diff options
| author |   Filipe Manana <fdmanana@suse.com> | 2014-09-11 11:44:49 +0100 |
|---|---|---|
| committer |   Chris Mason <clm@fb.com> | 2014-09-17 13:38:23 -0700 |
| commit | 78a017a2c92df9b571db0a55a016280f9019c65e (patch) | |
| tree | 777534b2e6b413d401f1fb212d4e24dcfc56dbd0 /fs/btrfs/ioctl.c | |
| parent | btrfs: Fix a deadlock in btrfs_dev_replace_finishing() (diff) | |
| download | linux-dev-78a017a2c92df9b571db0a55a016280f9019c65e.tar.xz linux-dev-78a017a2c92df9b571db0a55a016280f9019c65e.zip | |
Btrfs: add missing compression property remove in btrfs_ioctl_setflags
The behaviour of a 'chattr -c' consists of getting the current flags,
clearing the FS_COMPR_FL bit and then sending the result to the set
flags ioctl - this means the bit FS_NOCOMP_FL isn't set in the flags
passed to the ioctl. This results in the compression property not being
cleared from the inode - it was cleared only if the bit FS_NOCOMP_FL
was set in the received flags.
Reproducer:
$ mkfs.btrfs -f /dev/sdd
$ mount /dev/sdd /mnt && cd /mnt
$ mkdir a
$ chattr +c a
$ touch a/file
$ lsattr a/file
--------c------- a/file
$ chattr -c a
$ touch a/file2
$ lsattr a/file2
--------c------- a/file2
$ lsattr -d a
---------------- a
Reported-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 85ca3cce8554..f60d1ca389f0 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -332,6 +332,9 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) goto out_drop; } else { + ret = btrfs_set_prop(inode, "btrfs.compression", NULL, 0, 0); + if (ret && ret != -ENODATA) + goto out_drop; ip->flags &= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS); } |