On Fri, Sep 25, 2015 at 02:43:01PM +0800, Anand Jain wrote: > btrfs_error() and btrfs_std_error() does the same thing > and calls _btrfs_std_error(), so consolidate them together. > And the main motivation is that btrfs_error() is closely > named with btrfs_err(), one handles error action the other > is to log the error, so don't closely name them. > > Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx> > Suggested-by: David Sterba <dsterba@xxxxxxxx> Reviewed-by: David Sterba <dsterba@xxxxxxxx> I guess we can live with the extra NULL argument, in some cases it does not make sense to put a string there. > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -4852,7 +4852,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, This looks like a bug, ret instead of err. The value of 'ret' is set by add/del qgroup relation which might fail if the relations are there, but we do not care. We're likely interested in the return code of btrfs_run_qgroups, ie. err. Can you please send a new patch on top of this? > "failed to update qgroup status and info\n"); > err = btrfs_end_transaction(trans, root); > if (err && !ret) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
