From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 26 Sep 2024 09:28:48 +0000 (+0200)
Subject: ubifs: Reduce kfree() calls in ubifs_purge_xattrs()
X-Git-Tag: microblaze-v6.16~483^2~12
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=79d3e562cb47864a10851328cbdfa0ee2177d9f6;p=linux-2.6-microblaze.git

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 cf77fb2074df..77ba172b6dea 100644
--- 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;
 }