From: Amir Shehata <amir.sheh...@intel.com> Instead of setting rc to -EFBIG for several cases in the loop lets just go to the out label on error which returns -E2BIG directly.
Signed-off-by: Amir Shehata <amir.sheh...@intel.com> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7734 Reviewed-on: http://review.whamcloud.com/18916 Reviewed-by: Olaf Weber <o...@sgi.com> Reviewed-by: Doug Oucharek <dou...@me.com> Signed-off-by: James Simmons <jsimm...@infradead.org> --- Changelog: v1) New patch to replace several patches. Went crazy for the one change per patch approach. drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c index 9ff9fe9..bf41ba3 100644 --- a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c +++ b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c @@ -190,29 +190,26 @@ struct cfs_cpt_table * cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len) { char *tmp = buf; - int rc = 0; + int rc; int i; int j; for (i = 0; i < cptab->ctb_nparts; i++) { - if (len > 0) { - rc = snprintf(tmp, len, "%d\t:", i); - len -= rc; - } + if (len <= 0) + goto out; + + rc = snprintf(tmp, len, "%d\t:", i); + len -= rc; - if (len <= 0) { - rc = -EFBIG; + if (len <= 0) goto out; - } tmp += rc; for_each_cpu(j, cptab->ctb_parts[i].cpt_cpumask) { rc = snprintf(tmp, len, "%d ", j); len -= rc; - if (len <= 0) { - rc = -EFBIG; + if (len <= 0) goto out; - } tmp += rc; } @@ -221,11 +218,9 @@ struct cfs_cpt_table * len--; } - out: - if (rc < 0) - return rc; - return tmp - buf; +out: + return -E2BIG; } EXPORT_SYMBOL(cfs_cpt_table_print); -- 1.8.3.1
