| Message ID | 20181011054256.5643-1-lufq.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: qgroup: move the qgroup->members check out from (!qgroup)'s else branch | expand |
On 11.10.2018 08:42, Lu Fengqi wrote: > There is no reason to put this check in (!qgroup)'s else branch because if > qgroup is null, it will goto out directly. So move it out to reduce > indent. > > No Functional Change. > > Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> > --- > fs/btrfs/qgroup.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c > index 27f517315388..af65ab1640b0 100644 > --- a/fs/btrfs/qgroup.c > +++ b/fs/btrfs/qgroup.c > @@ -1416,13 +1416,14 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) > if (!qgroup) { > ret = -ENOENT; > goto out; > - } else { > - /* check if there are no children of this qgroup */ > - if (!list_empty(&qgroup->members)) { > - ret = -EBUSY; > - goto out; > - } > } > + > + /* check if there are no children of this qgroup */ > + if (!list_empty(&qgroup->members)) { > + ret = -EBUSY; > + goto out; > + } > + > ret = del_qgroup_item(trans, qgroupid); > if (ret && ret != -ENOENT) > goto out; >
On Thu, Oct 11, 2018 at 01:42:56PM +0800, Lu Fengqi wrote: > There is no reason to put this check in (!qgroup)'s else branch because if > qgroup is null, it will goto out directly. So move it out to reduce > indent. > > No Functional Change. > > Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Added to misc-next, thanks.
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 27f517315388..af65ab1640b0 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1416,13 +1416,14 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) if (!qgroup) { ret = -ENOENT; goto out; - } else { - /* check if there are no children of this qgroup */ - if (!list_empty(&qgroup->members)) { - ret = -EBUSY; - goto out; - } } + + /* check if there are no children of this qgroup */ + if (!list_empty(&qgroup->members)) { + ret = -EBUSY; + goto out; + } + ret = del_qgroup_item(trans, qgroupid); if (ret && ret != -ENOENT) goto out;
There is no reason to put this check in (!qgroup)'s else branch because if qgroup is null, it will goto out directly. So move it out to reduce indent. No Functional Change. Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> --- fs/btrfs/qgroup.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)