From: James Simmons Date: Wed, 20 Jul 2016 20:31:48 +0000 (-0400) Subject: LU-8056 lprocfs: treat seq_printf as void function X-Git-Tag: 2.8.56~20 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F21453%2F2;p=fs%2Flustre-release.git LU-8056 lprocfs: treat seq_printf as void function In newer kernels seq_printf is a void function. Some of the seq_printf handle server side missed being updated to treat seq_printf as a void function. Change-Id: Icfd2f83ad4cd143eac228ed3d50beff533fcfe44 Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/21453 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Kit Westneat Reviewed-by: Alex Zhuravlev Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- diff --git a/lustre/ofd/lproc_ofd.c b/lustre/ofd/lproc_ofd.c index 281289c..c130194 100644 --- a/lustre/ofd/lproc_ofd.c +++ b/lustre/ofd/lproc_ofd.c @@ -510,10 +510,9 @@ static int ofd_brw_size_seq_show(struct seq_file *m, void *data) { struct obd_device *obd = m->private; struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev); - int rc; - rc = seq_printf(m, "%u\n", ofd->ofd_brw_size / ONE_MB_BRW_SIZE); - return rc; + seq_printf(m, "%u\n", ofd->ofd_brw_size / ONE_MB_BRW_SIZE); + return 0; } static ssize_t diff --git a/lustre/ptlrpc/nodemap_lproc.c b/lustre/ptlrpc/nodemap_lproc.c index 49e7ac63..f9692e3 100644 --- a/lustre/ptlrpc/nodemap_lproc.c +++ b/lustre/ptlrpc/nodemap_lproc.c @@ -177,7 +177,7 @@ static int nodemap_ranges_open(struct inode *inode, struct file *file) static int nodemap_fileset_seq_show(struct seq_file *m, void *data) { struct lu_nodemap *nodemap; - int rc; + int rc = 0; mutex_lock(&active_config_lock); nodemap = nodemap_lookup(m->private); @@ -189,7 +189,7 @@ static int nodemap_fileset_seq_show(struct seq_file *m, void *data) return rc; } - rc = seq_printf(m, "%s\n", nodemap->nm_fileset); + seq_printf(m, "%s\n", nodemap->nm_fileset); nodemap_putref(nodemap); return rc; } diff --git a/lustre/quota/qmt_pool.c b/lustre/quota/qmt_pool.c index 69b209f..e413053 100644 --- a/lustre/quota/qmt_pool.c +++ b/lustre/quota/qmt_pool.c @@ -176,7 +176,8 @@ static int qpi_soft_least_qunit_seq_show(struct seq_file *m, void *data) struct qmt_pool_info *pool = m->private; LASSERT(pool != NULL); - return seq_printf(m, "%lu\n", pool->qpi_soft_least_qunit); + seq_printf(m, "%lu\n", pool->qpi_soft_least_qunit); + return 0; } static ssize_t