From: Anand Jain <anand.jain@oracle.com>
Date: Thu, 10 Mar 2016 04:22:15 +0000 (+0800)
Subject: btrfs: pass the right error code to the btrfs_std_error
X-Git-Tag: v4.5.7~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ea5cce51c0a9a22aa016e1c7b7c62452124ae12;p=thirdparty%2Fkernel%2Fstable.git

btrfs: pass the right error code to the btrfs_std_error

commit ad8403df054c9b5dc3175a26c6179571b9cafa4e upstream.

Also drop the newline from the message.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 14e291422ab11..4b035cc7ed543 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4849,8 +4849,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_std_error(root->fs_info, err,
+			    "failed to update qgroup status and info");
 	err = btrfs_end_transaction(trans, root);
 	if (err && !ret)
 		ret = err;