[PATCH] xfs: tidy up xfs_attr_shortform_list

* [PATCH] xfs: tidy up xfs_attr_shortform_list
@ 2016-03-02 15:28 Mateusz Guzik
  2016-03-02 15:47 ` Christoph Hellwig
  0 siblings, 1 reply; 2+ messages in thread
From: Mateusz Guzik @ 2016-03-02 15:28 UTC (permalink / raw)
  To: xfs; +Cc: Christoph Hellwig

Remove an unnecessary i == nsbuf test and replace a common label for error
handling after sbuf is allocated.

Signed-off-by: Mateusz Guzik <mguzik@redhat.com>
---
 fs/xfs/xfs_attr_list.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 4fa1482..7129fbc 100644
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -74,7 +74,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
 	xfs_attr_sf_entry_t *sfe;
 	xfs_inode_t *dp;
 	int sbsize, nsbuf, count, i;
-	int error;
+	int error = 0;
 
 	ASSERT(context != NULL);
 	dp = context->dp;
@@ -146,8 +146,8 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
 			XFS_CORRUPTION_ERROR("xfs_attr_shortform_list",
 					     XFS_ERRLEVEL_LOW,
 					     context->dp->i_mount, sfe);
-			kmem_free(sbuf);
-			return -EFSCORRUPTED;
+			error = -EFSCORRUPTED;
+			goto out;
 		}
 
 		sbp->entno = i;
@@ -183,10 +183,6 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
 			break;
 		}
 	}
-	if (i == nsbuf) {
-		kmem_free(sbuf);
-		return 0;
-	}
 
 	/*
 	 * Loop putting entries into the user buffer.
@@ -202,17 +198,16 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
 					sbp->namelen,
 					sbp->valuelen,
 					&sbp->name[sbp->namelen]);
-		if (error) {
-			kmem_free(sbuf);
-			return error;
-		}
+		if (error)
+			break;
 		if (context->seen_enough)
 			break;
 		cursor->offset++;
 	}
 
+out:
 	kmem_free(sbuf);
-	return 0;
+	return error;
 }
 
 STATIC int
-- 
1.8.3.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply related	[flat|nested] 2+ messages in thread