Commit 79d3e562 authored by Markus Elfring's avatar Markus Elfring Committed by Richard Weinberger
Browse files

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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Reviewed-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent c6fa76da

fs/ubifs/xattr.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}