Commit 91b3a685 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

staging: lustre: Convert uses of "int rc = seq_printf(...)"

The seq_printf return value, because it's frequently misused,
will eventually be converted to void.

See: commit 1f33c41c ("seq_file: Rename seq_overflow() to
     seq_has_overflowed() and make public")

Convert these uses to:

	seq_printf(seq, ...);

	return 0;

Done via cocci script:

@@
struct seq_file *seq;
int i;
@@
-	i = seq_printf(seq,
+	seq_printf(seq,
		   ...);
	...
-	return i;
+	return 0;

@@
struct seq_file *seq;
int i;
@@
-	i = 0;
-	i += seq_printf(seq,
+	seq_printf(seq,
	           ...);
	...
-	return i;
+	return 0;

With some additional reformatting and typing post conversion
to remove the now unnecessary "int i;" declaration.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9be1085
...@@ -120,15 +120,14 @@ static int ...@@ -120,15 +120,14 @@ static int
lprocfs_fid_space_seq_show(struct seq_file *m, void *unused) lprocfs_fid_space_seq_show(struct seq_file *m, void *unused)
{ {
struct lu_client_seq *seq = (struct lu_client_seq *)m->private; struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
int rc;
LASSERT(seq != NULL); LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex); mutex_lock(&seq->lcs_mutex);
rc = seq_printf(m, "[%#llx - %#llx]:%x:%s\n", PRANGE(&seq->lcs_space)); seq_printf(m, "[%#llx - %#llx]:%x:%s\n", PRANGE(&seq->lcs_space));
mutex_unlock(&seq->lcs_mutex); mutex_unlock(&seq->lcs_mutex);
return rc; return 0;
} }
static ssize_t lprocfs_fid_width_seq_write(struct file *file, static ssize_t lprocfs_fid_width_seq_write(struct file *file,
...@@ -170,30 +169,28 @@ static int ...@@ -170,30 +169,28 @@ static int
lprocfs_fid_width_seq_show(struct seq_file *m, void *unused) lprocfs_fid_width_seq_show(struct seq_file *m, void *unused)
{ {
struct lu_client_seq *seq = (struct lu_client_seq *)m->private; struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
int rc;
LASSERT(seq != NULL); LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex); mutex_lock(&seq->lcs_mutex);
rc = seq_printf(m, "%llu\n", seq->lcs_width); seq_printf(m, "%llu\n", seq->lcs_width);
mutex_unlock(&seq->lcs_mutex); mutex_unlock(&seq->lcs_mutex);
return rc; return 0;
} }
static int static int
lprocfs_fid_fid_seq_show(struct seq_file *m, void *unused) lprocfs_fid_fid_seq_show(struct seq_file *m, void *unused)
{ {
struct lu_client_seq *seq = (struct lu_client_seq *)m->private; struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
int rc;
LASSERT(seq != NULL); LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex); mutex_lock(&seq->lcs_mutex);
rc = seq_printf(m, DFID"\n", PFID(&seq->lcs_fid)); seq_printf(m, DFID "\n", PFID(&seq->lcs_fid));
mutex_unlock(&seq->lcs_mutex); mutex_unlock(&seq->lcs_mutex);
return rc; return 0;
} }
static int static int
...@@ -201,17 +198,17 @@ lprocfs_fid_server_seq_show(struct seq_file *m, void *unused) ...@@ -201,17 +198,17 @@ lprocfs_fid_server_seq_show(struct seq_file *m, void *unused)
{ {
struct lu_client_seq *seq = (struct lu_client_seq *)m->private; struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
struct client_obd *cli; struct client_obd *cli;
int rc;
LASSERT(seq != NULL); LASSERT(seq != NULL);
if (seq->lcs_exp != NULL) { if (seq->lcs_exp != NULL) {
cli = &seq->lcs_exp->exp_obd->u.cli; cli = &seq->lcs_exp->exp_obd->u.cli;
rc = seq_printf(m, "%s\n", cli->cl_target_uuid.uuid); seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
} else { } else {
rc = seq_printf(m, "%s\n", seq->lcs_srv->lss_name); seq_printf(m, "%s\n", seq->lcs_srv->lss_name);
} }
return rc;
return 0;
} }
LPROC_SEQ_FOPS(lprocfs_fid_space); LPROC_SEQ_FOPS(lprocfs_fid_space);
......
...@@ -804,7 +804,9 @@ static int ll_xattr_cache_seq_show(struct seq_file *m, void *v) ...@@ -804,7 +804,9 @@ static int ll_xattr_cache_seq_show(struct seq_file *m, void *v)
struct super_block *sb = m->private; struct super_block *sb = m->private;
struct ll_sb_info *sbi = ll_s2sbi(sb); struct ll_sb_info *sbi = ll_s2sbi(sb);
return seq_printf(m, "%u\n", sbi->ll_xattr_cache_enabled); seq_printf(m, "%u\n", sbi->ll_xattr_cache_enabled);
return 0;
} }
static ssize_t ll_xattr_cache_seq_write(struct file *file, static ssize_t ll_xattr_cache_seq_write(struct file *file,
......
...@@ -43,12 +43,12 @@ static int mdc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v) ...@@ -43,12 +43,12 @@ static int mdc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v)
{ {
struct obd_device *dev = m->private; struct obd_device *dev = m->private;
struct client_obd *cli = &dev->u.cli; struct client_obd *cli = &dev->u.cli;
int rc;
client_obd_list_lock(&cli->cl_loi_list_lock); client_obd_list_lock(&cli->cl_loi_list_lock);
rc = seq_printf(m, "%u\n", cli->cl_max_rpcs_in_flight); seq_printf(m, "%u\n", cli->cl_max_rpcs_in_flight);
client_obd_list_unlock(&cli->cl_loi_list_lock); client_obd_list_unlock(&cli->cl_loi_list_lock);
return rc;
return 0;
} }
static ssize_t mdc_max_rpcs_in_flight_seq_write(struct file *file, static ssize_t mdc_max_rpcs_in_flight_seq_write(struct file *file,
......
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
static int osc_active_seq_show(struct seq_file *m, void *v) static int osc_active_seq_show(struct seq_file *m, void *v)
{ {
struct obd_device *dev = m->private; struct obd_device *dev = m->private;
int rc;
LPROCFS_CLIMP_CHECK(dev); LPROCFS_CLIMP_CHECK(dev);
rc = seq_printf(m, "%d\n", !dev->u.cli.cl_import->imp_deactive); seq_printf(m, "%d\n", !dev->u.cli.cl_import->imp_deactive);
LPROCFS_CLIMP_EXIT(dev); LPROCFS_CLIMP_EXIT(dev);
return rc;
return 0;
} }
static ssize_t osc_active_seq_write(struct file *file, static ssize_t osc_active_seq_write(struct file *file,
...@@ -80,12 +80,12 @@ static int osc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v) ...@@ -80,12 +80,12 @@ static int osc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v)
{ {
struct obd_device *dev = m->private; struct obd_device *dev = m->private;
struct client_obd *cli = &dev->u.cli; struct client_obd *cli = &dev->u.cli;
int rc;
client_obd_list_lock(&cli->cl_loi_list_lock); client_obd_list_lock(&cli->cl_loi_list_lock);
rc = seq_printf(m, "%u\n", cli->cl_max_rpcs_in_flight); seq_printf(m, "%u\n", cli->cl_max_rpcs_in_flight);
client_obd_list_unlock(&cli->cl_loi_list_lock); client_obd_list_unlock(&cli->cl_loi_list_lock);
return rc;
return 0;
} }
static ssize_t osc_max_rpcs_in_flight_seq_write(struct file *file, static ssize_t osc_max_rpcs_in_flight_seq_write(struct file *file,
...@@ -165,12 +165,14 @@ static int osc_cached_mb_seq_show(struct seq_file *m, void *v) ...@@ -165,12 +165,14 @@ static int osc_cached_mb_seq_show(struct seq_file *m, void *v)
struct client_obd *cli = &dev->u.cli; struct client_obd *cli = &dev->u.cli;
int shift = 20 - PAGE_CACHE_SHIFT; int shift = 20 - PAGE_CACHE_SHIFT;
return seq_printf(m, seq_printf(m,
"used_mb: %d\n" "used_mb: %d\n"
"busy_cnt: %d\n", "busy_cnt: %d\n",
(atomic_read(&cli->cl_lru_in_list) + (atomic_read(&cli->cl_lru_in_list) +
atomic_read(&cli->cl_lru_busy)) >> shift, atomic_read(&cli->cl_lru_busy)) >> shift,
atomic_read(&cli->cl_lru_busy)); atomic_read(&cli->cl_lru_busy));
return 0;
} }
/* shrink the number of caching pages to a specific number */ /* shrink the number of caching pages to a specific number */
...@@ -212,12 +214,12 @@ static int osc_cur_dirty_bytes_seq_show(struct seq_file *m, void *v) ...@@ -212,12 +214,12 @@ static int osc_cur_dirty_bytes_seq_show(struct seq_file *m, void *v)
{ {
struct obd_device *dev = m->private; struct obd_device *dev = m->private;
struct client_obd *cli = &dev->u.cli; struct client_obd *cli = &dev->u.cli;
int rc;
client_obd_list_lock(&cli->cl_loi_list_lock); client_obd_list_lock(&cli->cl_loi_list_lock);
rc = seq_printf(m, "%lu\n", cli->cl_dirty); seq_printf(m, "%lu\n", cli->cl_dirty);
client_obd_list_unlock(&cli->cl_loi_list_lock); client_obd_list_unlock(&cli->cl_loi_list_lock);
return rc;
return 0;
} }
LPROC_SEQ_FOPS_RO(osc_cur_dirty_bytes); LPROC_SEQ_FOPS_RO(osc_cur_dirty_bytes);
...@@ -225,12 +227,12 @@ static int osc_cur_grant_bytes_seq_show(struct seq_file *m, void *v) ...@@ -225,12 +227,12 @@ static int osc_cur_grant_bytes_seq_show(struct seq_file *m, void *v)
{ {
struct obd_device *dev = m->private; struct obd_device *dev = m->private;
struct client_obd *cli = &dev->u.cli; struct client_obd *cli = &dev->u.cli;
int rc;
client_obd_list_lock(&cli->cl_loi_list_lock); client_obd_list_lock(&cli->cl_loi_list_lock);
rc = seq_printf(m, "%lu\n", cli->cl_avail_grant); seq_printf(m, "%lu\n", cli->cl_avail_grant);
client_obd_list_unlock(&cli->cl_loi_list_lock); client_obd_list_unlock(&cli->cl_loi_list_lock);
return rc;
return 0;
} }
static ssize_t osc_cur_grant_bytes_seq_write(struct file *file, static ssize_t osc_cur_grant_bytes_seq_write(struct file *file,
...@@ -271,12 +273,12 @@ static int osc_cur_lost_grant_bytes_seq_show(struct seq_file *m, void *v) ...@@ -271,12 +273,12 @@ static int osc_cur_lost_grant_bytes_seq_show(struct seq_file *m, void *v)
{ {
struct obd_device *dev = m->private; struct obd_device *dev = m->private;
struct client_obd *cli = &dev->u.cli; struct client_obd *cli = &dev->u.cli;
int rc;
client_obd_list_lock(&cli->cl_loi_list_lock); client_obd_list_lock(&cli->cl_loi_list_lock);
rc = seq_printf(m, "%lu\n", cli->cl_lost_grant); seq_printf(m, "%lu\n", cli->cl_lost_grant);
client_obd_list_unlock(&cli->cl_loi_list_lock); client_obd_list_unlock(&cli->cl_loi_list_lock);
return rc;
return 0;
} }
LPROC_SEQ_FOPS_RO(osc_cur_lost_grant_bytes); LPROC_SEQ_FOPS_RO(osc_cur_lost_grant_bytes);
......
...@@ -1328,13 +1328,12 @@ int lprocfs_rd_pinger_recov(struct seq_file *m, void *n) ...@@ -1328,13 +1328,12 @@ int lprocfs_rd_pinger_recov(struct seq_file *m, void *n)
{ {
struct obd_device *obd = m->private; struct obd_device *obd = m->private;
struct obd_import *imp = obd->u.cli.cl_import; struct obd_import *imp = obd->u.cli.cl_import;
int rc;
LPROCFS_CLIMP_CHECK(obd); LPROCFS_CLIMP_CHECK(obd);
rc = seq_printf(m, "%d\n", !imp->imp_no_pinger_recover); seq_printf(m, "%d\n", !imp->imp_no_pinger_recover);
LPROCFS_CLIMP_EXIT(obd); LPROCFS_CLIMP_EXIT(obd);
return rc; return 0;
} }
EXPORT_SYMBOL(lprocfs_rd_pinger_recov); EXPORT_SYMBOL(lprocfs_rd_pinger_recov);
......
...@@ -125,52 +125,50 @@ static struct ptlrpc_enc_page_pool { ...@@ -125,52 +125,50 @@ static struct ptlrpc_enc_page_pool {
*/ */
int sptlrpc_proc_enc_pool_seq_show(struct seq_file *m, void *v) int sptlrpc_proc_enc_pool_seq_show(struct seq_file *m, void *v)
{ {
int rc;
spin_lock(&page_pools.epp_lock); spin_lock(&page_pools.epp_lock);
rc = seq_printf(m, seq_printf(m,
"physical pages: %lu\n" "physical pages: %lu\n"
"pages per pool: %lu\n" "pages per pool: %lu\n"
"max pages: %lu\n" "max pages: %lu\n"
"max pools: %u\n" "max pools: %u\n"
"total pages: %lu\n" "total pages: %lu\n"
"total free: %lu\n" "total free: %lu\n"
"idle index: %lu/100\n" "idle index: %lu/100\n"
"last shrink: %lds\n" "last shrink: %lds\n"
"last access: %lds\n" "last access: %lds\n"
"max pages reached: %lu\n" "max pages reached: %lu\n"
"grows: %u\n" "grows: %u\n"
"grows failure: %u\n" "grows failure: %u\n"
"shrinks: %u\n" "shrinks: %u\n"
"cache access: %lu\n" "cache access: %lu\n"
"cache missing: %lu\n" "cache missing: %lu\n"
"low free mark: %lu\n" "low free mark: %lu\n"
"max waitqueue depth: %u\n" "max waitqueue depth: %u\n"
"max wait time: "CFS_TIME_T"/%u\n" "max wait time: " CFS_TIME_T "/%u\n",
, totalram_pages,
totalram_pages, PAGES_PER_POOL,
PAGES_PER_POOL, page_pools.epp_max_pages,
page_pools.epp_max_pages, page_pools.epp_max_pools,
page_pools.epp_max_pools, page_pools.epp_total_pages,
page_pools.epp_total_pages, page_pools.epp_free_pages,
page_pools.epp_free_pages, page_pools.epp_idle_idx,
page_pools.epp_idle_idx, get_seconds() - page_pools.epp_last_shrink,
get_seconds() - page_pools.epp_last_shrink, get_seconds() - page_pools.epp_last_access,
get_seconds() - page_pools.epp_last_access, page_pools.epp_st_max_pages,
page_pools.epp_st_max_pages, page_pools.epp_st_grows,
page_pools.epp_st_grows, page_pools.epp_st_grow_fails,
page_pools.epp_st_grow_fails, page_pools.epp_st_shrinks,
page_pools.epp_st_shrinks, page_pools.epp_st_access,
page_pools.epp_st_access, page_pools.epp_st_missings,
page_pools.epp_st_missings, page_pools.epp_st_lowfree,
page_pools.epp_st_lowfree, page_pools.epp_st_max_wqlen,
page_pools.epp_st_max_wqlen, page_pools.epp_st_max_wait,
page_pools.epp_st_max_wait, HZ HZ);
);
spin_unlock(&page_pools.epp_lock); spin_unlock(&page_pools.epp_lock);
return rc;
return 0;
} }
static void enc_pools_release_free_pages(long npages) static void enc_pools_release_free_pages(long npages)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment