diff options
| author | Chris Mason <clm@fb.com> | 2015-10-13 01:24:15 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-13 01:24:15 +0200 |
| commit | 62fb50ab7c903357c92cef2f7677235b92ac575f (patch) | |
| tree | 28f66d4e2c14b508b6b24795bfadf11aaada2d75 /fs/btrfs/ioctl.c | |
| parent | Merge branch 'cleanup/messages' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Btrfs: move kobj stuff out of dev_replace lock range (diff) | |
| download | linux-62fb50ab7c903357c92cef2f7677235b92ac575f.tar.xz linux-62fb50ab7c903357c92cef2f7677235b92ac575f.zip | |
Merge branch 'anand/sysfs-updates-v4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 2e520c635709..80342d3fa5d2 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4806,7 +4806,7 @@ 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_error(root->fs_info, ret, + btrfs_std_error(root->fs_info, ret, "failed to update qgroup status and info\n"); err = btrfs_end_transaction(trans, root); if (err && !ret) |