ubifs: Reduce kfree() calls in ubifs_purge_xattrs()

Move a pair of kfree() calls behind the label “out_err”
so that two statements can be better reused at the end of
this function implementation.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index cf77fb2..77ba172 100644 (file)
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -532,8 +532,6 @@ int ubifs_purge_xattrs(struct inode *host)
                        ubifs_err(c, "dead directory entry '%s', error %d",
                                  xent->name, err);
                        ubifs_ro_mode(c, err);
-                       kfree(pxent);
-                       kfree(xent);
                        goto out_err;
                }
 
@@ -543,8 +541,6 @@ int ubifs_purge_xattrs(struct inode *host)
                err = remove_xattr(c, host, xino, &nm);
                iput(xino);
                if (err) {
-                       kfree(pxent);
-                       kfree(xent);
                        ubifs_err(c, "cannot remove xattr, error %d", err);
                        goto out_err;
                }
@@ -564,6 +560,8 @@ int ubifs_purge_xattrs(struct inode *host)
        return 0;
 
 out_err:
+       kfree(pxent);
+       kfree(xent);
        up_write(&ubifs_inode(host)->xattr_sem);
        return err;
 }