staging: lustre: Remove use of return val of seq_printf
cover staging: lustre: Remove use of return val of seq_printf
seq_printf should eventually be converted to a void function.
Remove the uses of seq_printf return values and use seq_has_overflowed() instead.
Joe Perches (3):
staging: lustre: Convert return seq_printf(...) uses to seq_has_overflowed
staging: lustre: Convert uses of "int rc = seq_printf(...)"
staging: lustre: Convert remaining uses of "= seq_printf(...)"
drivers/staging/lustre/lustre/fid/lproc_fid.c | 23 ++-- drivers/staging/lustre/lustre/libcfs/hash.c | 11 +- drivers/staging/lustre/lustre/llite/lproc_llite.c | 127 ++++++++++++--------- drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 18 ++- drivers/staging/lustre/lustre/lov/lproc_lov.c | 30 +++-- drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 6 +- .../lustre/lustre/obdclass/linux/linux-module.c | 40 ++++--- .../lustre/lustre/obdclass/lprocfs_status.c | 120 ++++++++++--------- drivers/staging/lustre/lustre/obdclass/lu_object.c | 25 ++-- drivers/staging/lustre/lustre/osc/lproc_osc.c | 67 +++++------ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 25 ++-- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 82 +++++++------ 12 files changed, 313 insertions(+), 261 deletions(-)
Signature · 1 line
2.1.2
PATCH 1/3 staging: lustre: Convert return seq_printf(...) uses to seq_has_overflowed
The seq_printf return value will eventually be converted to void.
Convert these uses to:
seq_printf(seq, ...); return seq_has_overflowed(seq);
Done via cocci script:
@@
struct seq_file *seq;
@@
- return
\(seq_printf\|seq_puts\|seq_putc\)(seq, ...);
+ return seq_has_overflowed(seq);
With some additional reformatting and typing post conversion
Miscellanea:
o convert an rc++ use to a bool
o use seq_puts with fixed strings where appropriate
--- drivers/staging/lustre/lustre/libcfs/hash.c | 11 +-- drivers/staging/lustre/lustre/llite/lproc_llite.c | 88 ++++++++++++---------- drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 18 +++-- drivers/staging/lustre/lustre/lov/lproc_lov.c | 30 +++++--- .../lustre/lustre/obdclass/linux/linux-module.c | 40 +++++----- .../lustre/lustre/obdclass/lprocfs_status.c | 26 ++++--- drivers/staging/lustre/lustre/obdclass/lu_object.c | 25 +++--- drivers/staging/lustre/lustre/osc/lproc_osc.c | 22 +++--- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 20 +++-- 9 files changed, 164 insertions(+), 116 deletions(-)
drivers/staging/lustre/lustre/libcfs/hash.c +6 -5
@@ -2010,11 +2010,12 @@ EXPORT_SYMBOL(cfs_hash_rehash_key);int cfs_hash_debug_header (struct seq_file *m) { -return seq_printf (m,"%-*s%6s%6s%6s%6s%6s%6s%6s%7s%8s%8s%8s%s\n" , -CFS_HASH_BIGNAME_LEN , -"name" ,"cur" ,"min" ,"max" ,"theta" ,"t-min" ,"t-max" , -"flags" ,"rehash" ,"count" ,"maxdep" ,"maxdepb" , -" distribution" ); +seq_printf (m,"%-*s%6s%6s%6s%6s%6s%6s%6s%7s%8s%8s%8s%s\n" , +CFS_HASH_BIGNAME_LEN , +"name" ,"cur" ,"min" ,"max" ,"theta" ,"t-min" ,"t-max" , +"flags" ,"rehash" ,"count" ,"maxdep" ,"maxdepb" , +" distribution" ); +return seq_has_overflowed (m); }EXPORT_SYMBOL (cfs_hash_debug_header);
drivers/staging/lustre/lustre/llite/lproc_llite.c +49 -39
173 lines not on this page · raw message
drivers/staging/lustre/lustre/lmv/lproc_lmv.c +12 -6
@@ -48,7 +48,8 @@ static int lmv_numobd_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); desc = &dev->u.lmv.desc; -return seq_printf (m,"%u\n" , desc->ld_tgt_count); +seq_printf (m,"%u\n" , desc->ld_tgt_count); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (lmv_numobd);
@@ -82,7 +83,8 @@ static int lmv_placement_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); lmv = &dev->u.lmv; -return seq_printf (m,"%s\n" ,placement_policy2name (lmv->lmv_placement)); +seq_printf (m,"%s\n" ,placement_policy2name (lmv->lmv_placement)); +return seq_has_overflowed (m); }#define MAX_POLICY_STRING_SIZE 64
@@ -130,7 +132,8 @@ static int lmv_activeobd_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); desc = &dev->u.lmv.desc; -return seq_printf (m,"%u\n" , desc->ld_active_tgt_count); +seq_printf (m,"%u\n" , desc->ld_active_tgt_count); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (lmv_activeobd);
@@ -141,7 +144,8 @@ static int lmv_desc_uuid_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); lmv = &dev->u.lmv; -return seq_printf (m,"%s\n" , lmv->desc.ld_uuid.uuid); +seq_printf (m,"%s\n" , lmv->desc.ld_uuid.uuid); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (lmv_desc_uuid);
@@ -171,8 +175,10 @@ static int lmv_tgt_seq_show(struct seq_file *p, void *v)if (tgt ==NULL )return 0 ; -return seq_printf (p,"%d: %s %sACTIVE\n" , tgt->ltd_idx, - tgt->ltd_uuid.uuid, tgt->ltd_active ?"" :"IN" ); +seq_printf (p,"%d: %s %sACTIVE\n" , + tgt->ltd_idx, tgt->ltd_uuid.uuid, + tgt->ltd_active ?"" :"IN" ); +return seq_has_overflowed (p); }static struct seq_operations lmv_tgt_sops = {
drivers/staging/lustre/lustre/lov/lproc_lov.c +19 -11
@@ -48,7 +48,8 @@ static int lov_stripesize_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); desc = &dev->u.lov.desc; -return seq_printf (m,"%llu\n" , desc->ld_default_stripe_size); +seq_printf (m,"%llu\n" , desc->ld_default_stripe_size); +return seq_has_overflowed (m); } static ssize_t lov_stripesize_seq_write(struct file *file,
@@ -79,7 +80,8 @@ static int lov_stripeoffset_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); desc = &dev->u.lov.desc; -return seq_printf (m,"%llu\n" , desc->ld_default_stripe_offset); +seq_printf (m,"%llu\n" , desc->ld_default_stripe_offset); +return seq_has_overflowed (m); } static ssize_t lov_stripeoffset_seq_write(struct file *file,
@@ -109,7 +111,8 @@ static int lov_stripetype_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); desc = &dev->u.lov.desc; -return seq_printf (m,"%u\n" , desc->ld_pattern); +seq_printf (m,"%u\n" , desc->ld_pattern); +return seq_has_overflowed (m); } static ssize_t lov_stripetype_seq_write(struct file *file,
@@ -139,8 +142,8 @@ static int lov_stripecount_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); desc = &dev->u.lov.desc; -return seq_printf (m,"%d\n" , - (__s16)(desc->ld_default_stripe_count +1 ) -1 ); +seq_printf (m,"%d\n" , (__s16)(desc->ld_default_stripe_count +1 ) -1 ); +return seq_has_overflowed (m); } static ssize_t lov_stripecount_seq_write(struct file *file,
@@ -170,7 +173,8 @@ static int lov_numobd_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); desc = &dev->u.lov.desc; -return seq_printf (m,"%u\n" , desc->ld_tgt_count); +seq_printf (m,"%u\n" , desc->ld_tgt_count); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (lov_numobd);
@@ -181,7 +185,8 @@ static int lov_activeobd_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); desc = &dev->u.lov.desc; -return seq_printf (m,"%u\n" , desc->ld_active_tgt_count); +seq_printf (m,"%u\n" , desc->ld_active_tgt_count); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (lov_activeobd);
@@ -192,7 +197,8 @@ static int lov_desc_uuid_seq_show(struct seq_file *m, void *v)LASSERT (dev !=NULL ); lov = &dev->u.lov; -return seq_printf (m,"%s\n" , lov->desc.ld_uuid.uuid); +seq_printf (m,"%s\n" , lov->desc.ld_uuid.uuid); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (lov_desc_uuid);
@@ -228,9 +234,11 @@ static void *lov_tgt_seq_next(struct seq_file *p, void *v, loff_t *pos)static int lov_tgt_seq_show (struct seq_file *p,void *v) {struct lov_tgt_desc *tgt = v; -return seq_printf (p,"%d: %s %sACTIVE\n" , tgt->ltd_index, -obd_uuid2str (&tgt->ltd_uuid), - tgt->ltd_active ?"" :"IN" ); + +seq_printf (p,"%d: %s %sACTIVE\n" , + tgt->ltd_index,obd_uuid2str (&tgt->ltd_uuid), + tgt->ltd_active ?"" :"IN" ); +return seq_has_overflowed (p); }struct seq_operations lov_tgt_sops = {
drivers/staging/lustre/lustre/obdclass/linux/linux-module.c +23 -17
@@ -219,21 +219,23 @@ struct miscdevice obd_psdev = {#if defined (CONFIG_PROC_FS )int obd_proc_version_seq_show (struct seq_file *m,void *v) { -return seq_printf (m,"lustre: %s\nkernel: %s\nbuild: %s\n" , -LUSTRE_VERSION_STRING ,"patchless_client" , -BUILD_VERSION ); +seq_printf (m,"lustre: %s\nkernel: %s\nbuild: %s\n" , +LUSTRE_VERSION_STRING ,"patchless_client" ,BUILD_VERSION ); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (obd_proc_version);int obd_proc_pinger_seq_show (struct seq_file *m,void *v) { -return seq_printf (m,"%s\n" ,"on" ); +seq_printf (m,"%s\n" ,"on" ); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (obd_proc_pinger);static int obd_proc_health_seq_show (struct seq_file *m,void *v) { -int rc =0 , i; +bool healthy = true; +int i;if (libcfs_catastrophe)seq_printf (m,"LBUG\n" );
@@ -255,25 +257,27 @@ static int obd_proc_health_seq_show(struct seq_file *m, void *v)if (obd_health_check (NULL , obd)) {seq_printf (m,"device %s reported unhealthy\n" , - obd->obd_name); - rc++; + obd->obd_name); + healthy = false; }class_decref (obd, __func__, current);read_lock (&obd_dev_lock); }read_unlock (&obd_dev_lock); -if (rc ==0 ) -return seq_printf (m,"healthy\n" ); +if (healthy) +seq_puts (m,"healthy\n" ); +else +seq_puts (m,"NOT HEALTHY\n" ); -seq_printf (m,"NOT HEALTHY\n" ); -return 0 ; +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (obd_proc_health);static int obd_proc_jobid_var_seq_show (struct seq_file *m,void *v) { -return seq_printf (m,"%s\n" , obd_jobid_var); +seq_printf (m,"%s\n" , obd_jobid_var); +return seq_has_overflowed (m); } static ssize_t obd_proc_jobid_var_seq_write(struct file *file,
@@ -299,7 +303,8 @@ LPROC_SEQ_FOPS(obd_proc_jobid_var);static int obd_proc_jobid_name_seq_show (struct seq_file *m,void *v) { -return seq_printf (m,"%s\n" , obd_jobid_var); +seq_printf (m,"%s\n" , obd_jobid_var); +return seq_has_overflowed (m); } static ssize_t obd_proc_jobid_name_seq_write(struct file *file,
@@ -378,10 +383,11 @@ static int obd_device_list_seq_show(struct seq_file *p, void *v)else status ="--" ; -return seq_printf (p,"%3d %s %s %s %s %d\n" , - (int )index, status, obd->obd_type->typ_name, - obd->obd_name, obd->obd_uuid.uuid, -atomic_read (&obd->obd_refcount)); +seq_printf (p,"%3d %s %s %s %s %d\n" , + (int )index, status, obd->obd_type->typ_name, + obd->obd_name, obd->obd_uuid.uuid, +atomic_read (&obd->obd_refcount)); +return seq_has_overflowed (p); }struct seq_operations obd_device_list_sops = {
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c +17 -9
@@ -377,7 +377,8 @@ EXPORT_SYMBOL(lprocfs_register);/* Generic callbacks */ int lprocfs_rd_uint (struct seq_file *m,void *data) { -return seq_printf (m,"%u\n" , *(unsigned int *)data); +seq_printf (m,"%u\n" , *(unsigned int *)data); +return seq_has_overflowed (m); }EXPORT_SYMBOL (lprocfs_rd_uint);
@@ -403,7 +404,8 @@ EXPORT_SYMBOL(lprocfs_wr_uint);int lprocfs_rd_u64 (struct seq_file *m,void *data) { -return seq_printf (m,"%llu\n" , *(__u64 *)data); +seq_printf (m,"%llu\n" , *(__u64 *)data); +return seq_has_overflowed (m); }EXPORT_SYMBOL (lprocfs_rd_u64);
@@ -411,7 +413,8 @@ int lprocfs_rd_atomic(struct seq_file *m, void *data) {atomic_t *atom = data;LASSERT (atom !=NULL ); -return seq_printf (m,"%d\n" ,atomic_read (atom)); +seq_printf (m,"%d\n" ,atomic_read (atom)); +return seq_has_overflowed (m); }EXPORT_SYMBOL (lprocfs_rd_atomic);
@@ -439,7 +442,8 @@ int lprocfs_rd_uuid(struct seq_file *m, void *data)struct obd_device *obd = data;LASSERT (obd !=NULL ); -return seq_printf (m,"%s\n" , obd->obd_uuid.uuid); +seq_printf (m,"%s\n" , obd->obd_uuid.uuid); +return seq_has_overflowed (m); }EXPORT_SYMBOL (lprocfs_rd_uuid);
@@ -448,7 +452,8 @@ int lprocfs_rd_name(struct seq_file *m, void *data)struct obd_device *dev = data;LASSERT (dev !=NULL ); -return seq_printf (m,"%s\n" , dev->obd_name); +seq_printf (m,"%s\n" , dev->obd_name); +return seq_has_overflowed (m); }EXPORT_SYMBOL (lprocfs_rd_name);
@@ -924,7 +929,8 @@ int lprocfs_rd_num_exports(struct seq_file *m, void *data)struct obd_device *obd = data;LASSERT (obd !=NULL ); -return seq_printf (m,"%u\n" , obd->obd_num_exports); +seq_printf (m,"%u\n" , obd->obd_num_exports); +return seq_has_overflowed (m); }EXPORT_SYMBOL (lprocfs_rd_num_exports);
@@ -933,7 +939,8 @@ int lprocfs_rd_numrefs(struct seq_file *m, void *data)struct obd_type *class = (struct obd_type *) data;LASSERT (class !=NULL ); -return seq_printf (m,"%d\n" , class->typ_refcnt); +seq_printf (m,"%d\n" , class->typ_refcnt); +return seq_has_overflowed (m); }EXPORT_SYMBOL (lprocfs_rd_numrefs);
@@ -1606,8 +1613,9 @@ LPROC_SEQ_FOPS_RO(lproc_exp_hash);int lprocfs_nid_stats_clear_read (struct seq_file *m,void *data) { -return seq_printf (m,"%s\n" , -"Write into this file to clear all nid stats and stale nid entries" ); +seq_printf (m,"%s\n" , +"Write into this file to clear all nid stats and stale nid entries" ); +return seq_has_overflowed (m); }EXPORT_SYMBOL (lprocfs_nid_stats_clear_read);
drivers/staging/lustre/lustre/obdclass/lu_object.c +13 -12
@@ -2014,18 +2014,19 @@ int lu_site_stats_print(const struct lu_site *s, struct seq_file *m)memset (&stats,0 ,sizeof (stats));lu_site_stats_get (s->ls_obj_hash, &stats,1 ); -return seq_printf (m,"%d/%d %d/%d %d %d %d %d %d %d %d\n" , - stats.lss_busy, - stats.lss_total, - stats.lss_populated, -CFS_HASH_NHLIST (s->ls_obj_hash), - stats.lss_max_search, -ls_stats_read (s->ls_stats,LU_SS_CREATED ), -ls_stats_read (s->ls_stats,LU_SS_CACHE_HIT ), -ls_stats_read (s->ls_stats,LU_SS_CACHE_MISS ), -ls_stats_read (s->ls_stats,LU_SS_CACHE_RACE ), -ls_stats_read (s->ls_stats,LU_SS_CACHE_DEATH_RACE ), -ls_stats_read (s->ls_stats,LU_SS_LRU_PURGED )); +seq_printf (m,"%d/%d %d/%d %d %d %d %d %d %d %d\n" , + stats.lss_busy, + stats.lss_total, + stats.lss_populated, +CFS_HASH_NHLIST (s->ls_obj_hash), + stats.lss_max_search, +ls_stats_read (s->ls_stats,LU_SS_CREATED ), +ls_stats_read (s->ls_stats,LU_SS_CACHE_HIT ), +ls_stats_read (s->ls_stats,LU_SS_CACHE_MISS ), +ls_stats_read (s->ls_stats,LU_SS_CACHE_RACE ), +ls_stats_read (s->ls_stats,LU_SS_CACHE_DEATH_RACE ), +ls_stats_read (s->ls_stats,LU_SS_LRU_PURGED )); +return seq_has_overflowed (m); }EXPORT_SYMBOL (lu_site_stats_print);
drivers/staging/lustre/lustre/osc/lproc_osc.c +13 -9
@@ -289,8 +289,8 @@ static int osc_grant_shrink_interval_seq_show(struct seq_file *m, void *v)if (obd ==NULL )return 0 ; -return seq_printf (m,"%d\n" , - obd->u.cli.cl_grant_shrink_interval); +seq_printf (m,"%d\n" , obd->u.cli.cl_grant_shrink_interval); +return seq_has_overflowed (m); } static ssize_t osc_grant_shrink_interval_seq_write(struct file *file,
@@ -323,8 +323,8 @@ static int osc_checksum_seq_show(struct seq_file *m, void *v)if (obd ==NULL )return 0 ; -return seq_printf (m,"%d\n" , - obd->u.cli.cl_checksum ?1 :0 ); +seq_printf (m,"%d\n" , obd->u.cli.cl_checksum ?1 :0 ); +return seq_has_overflowed (m); } static ssize_t osc_checksum_seq_write(struct file *file,
@@ -405,7 +405,8 @@ static int osc_resend_count_seq_show(struct seq_file *m, void *v) {struct obd_device *obd = m->private; -return seq_printf (m,"%u\n" ,atomic_read (&obd->u.cli.cl_resends)); +seq_printf (m,"%u\n" ,atomic_read (&obd->u.cli.cl_resends)); +return seq_has_overflowed (m); } static ssize_t osc_resend_count_seq_write(struct file *file,
@@ -433,7 +434,8 @@ static int osc_contention_seconds_seq_show(struct seq_file *m, void *v)struct obd_device *obd = m->private;struct osc_device *od =obd2osc_dev (obd); -return seq_printf (m,"%u\n" , od->od_contention_time); +seq_printf (m,"%u\n" , od->od_contention_time); +return seq_has_overflowed (m); } static ssize_t osc_contention_seconds_seq_write(struct file *file,
@@ -453,7 +455,8 @@ static int osc_lockless_truncate_seq_show(struct seq_file *m, void *v)struct obd_device *obd = m->private;struct osc_device *od =obd2osc_dev (obd); -return seq_printf (m,"%u\n" , od->od_lockless_truncate); +seq_printf (m,"%u\n" , od->od_lockless_truncate); +return seq_has_overflowed (m); } static ssize_t osc_lockless_truncate_seq_write(struct file *file,
@@ -471,8 +474,9 @@ LPROC_SEQ_FOPS(osc_lockless_truncate);static int osc_destroys_in_flight_seq_show (struct seq_file *m,void *v) {struct obd_device *obd = m->private; -return seq_printf (m,"%u\n" , -atomic_read (&obd->u.cli.cl_destroy_in_flight)); + +seq_printf (m,"%u\n" ,atomic_read (&obd->u.cli.cl_destroy_in_flight)); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (osc_destroys_in_flight);
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c +12 -8
@@ -267,7 +267,8 @@ ptlrpc_lprocfs_req_history_len_seq_show(struct seq_file *m, void *v)ptlrpc_service_for_each_part (svcpt, i, svc) total += svcpt->scp_hist_nrqbds; -return seq_printf (m,"%d\n" , total); +seq_printf (m,"%d\n" , total); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (ptlrpc_lprocfs_req_history_len);
@@ -282,7 +283,8 @@ ptlrpc_lprocfs_req_history_max_seq_show(struct seq_file *m, void *n)ptlrpc_service_for_each_part (svcpt, i, svc) total += svc->srv_hist_nrqbds_cpt_max; -return seq_printf (m,"%d\n" , total); +seq_printf (m,"%d\n" , total); +return seq_has_overflowed (m); } static ssize_t
@@ -327,8 +329,8 @@ ptlrpc_lprocfs_threads_min_seq_show(struct seq_file *m, void *n) {struct ptlrpc_service *svc = m->private; -return seq_printf (m,"%d\n" , - svc->srv_nthrs_cpt_init * svc->srv_ncpts); +seq_printf (m,"%d\n" , svc->srv_nthrs_cpt_init * svc->srv_ncpts); +return seq_has_overflowed (m); } static ssize_t
@@ -371,7 +373,8 @@ ptlrpc_lprocfs_threads_started_seq_show(struct seq_file *m, void *n)ptlrpc_service_for_each_part (svcpt, i, svc) total += svcpt->scp_nthrs_running; -return seq_printf (m,"%d\n" , total); +seq_printf (m,"%d\n" , total); +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (ptlrpc_lprocfs_threads_started);
@@ -380,8 +383,8 @@ ptlrpc_lprocfs_threads_max_seq_show(struct seq_file *m, void *n) {struct ptlrpc_service *svc = m->private; -return seq_printf (m,"%d\n" , - svc->srv_nthrs_cpt_limit * svc->srv_ncpts); +seq_printf (m,"%d\n" , svc->srv_nthrs_cpt_limit * svc->srv_ncpts); +return seq_has_overflowed (m); } static ssize_t
@@ -1026,7 +1029,8 @@ LPROC_SEQ_FOPS_RO(ptlrpc_lprocfs_timeouts);static int ptlrpc_lprocfs_hp_ratio_seq_show (struct seq_file *m,void *v) {struct ptlrpc_service *svc = m->private; -return seq_printf (m,"%d" , svc->srv_hpreq_ratio); +seq_printf (m,"%d" , svc->srv_hpreq_ratio); +return seq_has_overflowed (m); } static ssize_t ptlrpc_lprocfs_hp_ratio_seq_write(struct file *file,
Signature · 1 line
2.1.2
PATCH 2/3 staging: lustre: Convert uses of "int rc = seq_printf(...)"
In reply to Joe PerchesThe seq_printf return value will eventually be converted to void.
Convert these uses to:
seq_printf(seq, ...); return seq_has_overflowed(seq);
Done via cocci script:
@@
struct seq_file *seq;
int i;
@@
- i = seq_printf(seq,
+ seq_printf(seq,
...); ...
- return i;
+ return seq_has_overflowed(seq);
@@
struct seq_file *seq;
int i;
@@
- i = 0;
- i += seq_printf(seq,
+ seq_printf(seq,
...); ...
- return i;
+ return seq_has_overflowed(seq);
With some additional reformatting and typing post conversion to remove the now unnecessary "int i;" declaration.
--- drivers/staging/lustre/lustre/fid/lproc_fid.c | 23 +++--- drivers/staging/lustre/lustre/llite/lproc_llite.c | 5 +- drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 6 +- drivers/staging/lustre/lustre/osc/lproc_osc.c | 45 ++++++------ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 5 +- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 82 +++++++++++----------- 6 files changed, 79 insertions(+), 87 deletions(-)
drivers/staging/lustre/lustre/fid/lproc_fid.c +10 -13
@@ -120,15 +120,14 @@ static int lprocfs_fid_space_seq_show(struct seq_file *m, void *unused) { struct lu_client_seq *seq = (struct lu_client_seq *)m->private; -int rc;LASSERT (seq !=NULL );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); -return rc; +return seq_has_overflowed (m); } static ssize_t lprocfs_fid_width_seq_write(struct file *file,
@@ -170,30 +169,28 @@ static int lprocfs_fid_width_seq_show(struct seq_file *m, void *unused) { struct lu_client_seq *seq = (struct lu_client_seq *)m->private; -int rc;LASSERT (seq !=NULL );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); -return rc; +return seq_has_overflowed (m); }static int lprocfs_fid_fid_seq_show (struct seq_file *m,void *unused) {struct lu_client_seq *seq = (struct lu_client_seq *)m->private; -int rc;LASSERT (seq !=NULL );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); -return rc; +return seq_has_overflowed (m); } static int
@@ -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 client_obd *cli; -int rc;LASSERT (seq !=NULL );if (seq->lcs_exp !=NULL ) { 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 { - rc =seq_printf (m,"%s\n" , seq->lcs_srv->lss_name); +seq_printf (m,"%s\n" , seq->lcs_srv->lss_name); } -return rc; + +return seq_has_overflowed (m); }LPROC_SEQ_FOPS (lprocfs_fid_space);
drivers/staging/lustre/lustre/llite/lproc_llite.c +2 -3
@@ -799,11 +799,10 @@ static int ll_xattr_cache_seq_show(struct seq_file *m, void *v) {struct super_block *sb = m->private;struct ll_sb_info *sbi =ll_s2sbi (sb); -int rc; - rc =seq_printf (m,"%u\n" , sbi->ll_xattr_cache_enabled); +seq_printf (m,"%u\n" , sbi->ll_xattr_cache_enabled); -return rc; +return seq_has_overflowed (m); } static ssize_t ll_xattr_cache_seq_write(struct file *file,
drivers/staging/lustre/lustre/mdc/lproc_mdc.c +3 -3
@@ -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 client_obd *cli = &dev->u.cli; -int rc;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); -return rc; + +return seq_has_overflowed (m); } static ssize_t mdc_max_rpcs_in_flight_seq_write(struct file *file,
drivers/staging/lustre/lustre/osc/lproc_osc.c +22 -23
98 lines not on this page · raw message
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c +2 -3
@@ -1328,13 +1328,12 @@ int lprocfs_rd_pinger_recov(struct seq_file *m, void *n) {struct obd_device *obd = m->private;struct obd_import *imp = obd->u.cli.cl_import; -int rc;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); -return rc; +return seq_has_overflowed (m); }EXPORT_SYMBOL (lprocfs_rd_pinger_recov);
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c +40 -42
92 lines not on this page · raw message
Signature · 1 line
2.1.2
PATCH 3/3 staging: lustre: Convert remaining uses of "= seq_printf(...)"
In reply to Joe PerchesThe seq_printf return value will eventually be converted to void.
Convert the remaining uses by hand.
--- drivers/staging/lustre/lustre/llite/lproc_llite.c | 34 +++++--- .../lustre/lustre/obdclass/lprocfs_status.c | 94 +++++++++++----------- 2 files changed, 70 insertions(+), 58 deletions(-)
drivers/staging/lustre/lustre/llite/lproc_llite.c +21 -13
@@ -58,8 +58,10 @@ static int ll_blksize_seq_show(struct seq_file *m, void *v) rc =ll_statfs_internal (sb, &osfs,cfs_time_shift_64 (-OBD_STATFS_CACHE_SECONDS ),OBD_STATFS_NODELAY ); -if (!rc) - rc =seq_printf (m,"%u\n" , osfs.os_bsize); +if (!rc) { +seq_printf (m,"%u\n" , osfs.os_bsize); + rc =seq_has_overflowed (m); + }return rc; }
@@ -82,7 +84,8 @@ static int ll_kbytestotal_seq_show(struct seq_file *m, void *v)while (blk_size >>=1 ) result <<=1 ; - rc =seq_printf (m,"%llu\n" , result); +seq_printf (m,"%llu\n" , result); + rc =seq_has_overflowed (m); }return rc; }
@@ -105,7 +108,8 @@ static int ll_kbytesfree_seq_show(struct seq_file *m, void *v)while (blk_size >>=1 ) result <<=1 ; - rc =seq_printf (m,"%llu\n" , result); +seq_printf (m,"%llu\n" , result); + rc =seq_has_overflowed (m); }return rc; }
@@ -128,7 +132,8 @@ static int ll_kbytesavail_seq_show(struct seq_file *m, void *v)while (blk_size >>=1 ) result <<=1 ; - rc =seq_printf (m,"%llu\n" , result); +seq_printf (m,"%llu\n" , result); + rc =seq_has_overflowed (m); }return rc; }
@@ -144,8 +149,10 @@ static int ll_filestotal_seq_show(struct seq_file *m, void *v) rc =ll_statfs_internal (sb, &osfs,cfs_time_shift_64 (-OBD_STATFS_CACHE_SECONDS ),OBD_STATFS_NODELAY ); -if (!rc) - rc =seq_printf (m,"%llu\n" , osfs.os_files); +if (!rc) { +seq_printf (m,"%llu\n" , osfs.os_files); + rc =seq_has_overflowed (m); + }return rc; }LPROC_SEQ_FOPS_RO (ll_filestotal);
@@ -160,8 +167,10 @@ static int ll_filesfree_seq_show(struct seq_file *m, void *v) rc =ll_statfs_internal (sb, &osfs,cfs_time_shift_64 (-OBD_STATFS_CACHE_SECONDS ),OBD_STATFS_NODELAY ); -if (!rc) - rc =seq_printf (m,"%llu\n" , osfs.os_ffree); +if (!rc) { +seq_printf (m,"%llu\n" , osfs.os_ffree); + rc =seq_has_overflowed (m); + }return rc; }LPROC_SEQ_FOPS_RO (ll_filesfree);
@@ -169,16 +178,15 @@ LPROC_SEQ_FOPS_RO(ll_filesfree);static int ll_client_type_seq_show (struct seq_file *m,void *v) {struct ll_sb_info *sbi =ll_s2sbi ((struct super_block *)m->private); -int rc;LASSERT (sbi !=NULL );if (sbi->ll_flags &LL_SBI_RMT_CLIENT ) - rc =seq_printf (m,"remote client\n" ); +seq_puts (m,"remote client\n" );else - rc =seq_printf (m,"local client\n" ); +seq_puts (m,"local client\n" ); -return rc; +return seq_has_overflowed (m); }LPROC_SEQ_FOPS_RO (ll_client_type);
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c +49 -45
183 lines not on this page · raw message
Signature · 1 line
2.1.2
Quoted 4 lines · Joe Perches
seq_printfshould eventually be converted to a void function.Remove the uses of
seq_printfreturn values and useseq_has_overflowed()instead.
Please do not apply.
These need conversions not to "return seq_has_overflowed()" but to "return 0".
Quoted 4 lines
Joe Perches (3):
staging: lustre: Convert returnseq_printf(...)uses toseq_has_overflowed
staging: lustre: Convert uses of "int rc =seq_printf(...)"
staging: lustre: Convert remaining uses of "=seq_printf(...)"