diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2011-04-15 03:03:17 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-14 16:10:28 -0400 |
| commit | ebcb904dfe31644857422e3bb62e50f76fe86255 (patch) | |
| tree | e4dd906d7f15e0a924b410acd236e8b7e3bc8bba | |
| parent | d0092bdda819914b8725da76a8c33eb06eb0bd21 (diff) | |
| download | linux-stable-ebcb904dfe31644857422e3bb62e50f76fe86255.tar.gz linux-stable-ebcb904dfe31644857422e3bb62e50f76fe86255.tar.bz2 linux-stable-ebcb904dfe31644857422e3bb62e50f76fe86255.zip | |
Btrfs: fix FS_IOC_SETFLAGS ioctl
Steps to reproduce the bug:
- Call FS_IOC_SETLFAGS ioctl with flags=FS_COMPR_FL
- Call FS_IOC_SETFLAGS ioctl with flags=0
- Call FS_IOC_GETFLAGS ioctl, and you'll see FS_COMPR_FL is still set!
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index aeabf6b6ccc8..3e7031d32eef 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -238,6 +238,8 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) } else if (flags & FS_COMPR_FL) { ip->flags |= BTRFS_INODE_COMPRESS; ip->flags &= ~BTRFS_INODE_NOCOMPRESS; + } else { + ip->flags &= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS); } trans = btrfs_join_transaction(root, 1); |