diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-16 15:46:24 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-16 15:46:24 +0200 |
| commit | 5ef64a3e757c94b2f2fc61465ef9603aaacaecff (patch) | |
| tree | 5f8da3043723e98e8313ebf180fe84a9a12b8db0 /fs/btrfs/ioctl.c | |
| parent | Merge branch 'misc-4.7' into for-chris-4.7-20160516 (diff) | |
| parent | btrfs: GFP_NOFS does not GFP_HIGHMEM (diff) | |
| download | linux-5ef64a3e757c94b2f2fc61465ef9603aaacaecff.tar.xz linux-5ef64a3e757c94b2f2fc61465ef9603aaacaecff.zip | |
Merge branch 'cleanups-4.7' into for-chris-4.7-20160516
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index c81d6daefe74..b0ccb3b03d94 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -125,10 +125,10 @@ static unsigned int btrfs_flags_to_ioctl(unsigned int flags) if (flags & BTRFS_INODE_NODATACOW) iflags |= FS_NOCOW_FL; - if ((flags & BTRFS_INODE_COMPRESS) && !(flags & BTRFS_INODE_NOCOMPRESS)) - iflags |= FS_COMPR_FL; - else if (flags & BTRFS_INODE_NOCOMPRESS) + if (flags & BTRFS_INODE_NOCOMPRESS) iflags |= FS_NOCOMP_FL; + else if (flags & BTRFS_INODE_COMPRESS) + iflags |= FS_COMPR_FL; return iflags; } @@ -4858,8 +4858,8 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg) /* update qgroup status and info */ err = btrfs_run_qgroups(trans, root->fs_info); if (err < 0) - btrfs_std_error(root->fs_info, ret, - "failed to update qgroup status and info\n"); + btrfs_handle_fs_error(root->fs_info, err, + "failed to update qgroup status and info"); err = btrfs_end_transaction(trans, root); if (err && !ret) ret = err; |