Lustre style fixes
cover Lustre style fixes
These patches fix some more of the low hanging fruits in the style problems highlighted by checkpatch. Now only false positive ERRORs are left.
This also converts all bare unsigneds into unsigned ints and a couple of spelling fixes.
Please consider.
Oleg Drokin (5):
staging/lustre/o2iblnd: Add missing space staging/lustre/socklnd: Fix whitespace problem staging/lustre: Convert all bare unsigned to unsigned int staging/lustre/o2iblnd: Fix misspelling intialized->intialized staging/lustre/o2iblnd: Fix misspelled attemps->attempts
drivers/staging/lustre/include/linux/lnet/lnetst.h | 6 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 4 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 4 +- .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 2 +- .../staging/lustre/lustre/include/lprocfs_status.h | 3 +- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 8 +- drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- drivers/staging/lustre/lustre/llite/rw26.c | 4 +- drivers/staging/lustre/lustre/llite/xattr_cache.c | 6 +- drivers/staging/lustre/lustre/lov/lov_pool.c | 3 +- .../lustre/lustre/obdclass/lprocfs_status.c | 3 +- drivers/staging/lustre/lustre/obdclass/lu_object.c | 6 +- .../staging/lustre/lustre/obdclass/obd_config.c | 4 +- drivers/staging/lustre/lustre/osc/osc_lock.c | 2 +- drivers/staging/lustre/lustre/osc/osc_quota.c | 4 +- drivers/staging/lustre/lustre/osc/osc_request.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/connection.c | 4 +- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 4 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 92 +++++++++++----------- 20 files changed, 88 insertions(+), 85 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/5 staging/lustre/o2iblnd: Add missing space
checkpatch highlighted missing space before assignment for lock variable.
+ spinlock_t *lock= &kiblnd_data.kib_connd_lock;
--- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +1 -1
@@ -3276,7 +3276,7 @@ kiblnd_disconnect_conn(struct kib_conn *conn)int kiblnd_connd (void *arg) { -spinlock_t *lock= &kiblnd_data.kib_connd_lock; +spinlock_t *lock = &kiblnd_data.kib_connd_lock;wait_queue_t wait;unsigned long flags;struct kib_conn *conn;
Signature · 1 line
2.7.4
PATCH 2/5 staging/lustre/socklnd: Fix whitespace problem
In reply to Oleg Drokincheckpatch highlighted there are 8 spaces that could be converted to a tab:
ERROR: code indent should use tabs where possible
+^I^I^I^I^I */$
--- drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h +1 -1
@@ -334,7 +334,7 @@ struct ksock_conn {atomic_t ksnc_conn_refcount;/* conn refcount */ atomic_t ksnc_sock_refcount;/* sock refcount */ struct ksock_sched *ksnc_scheduler;/* who schedules this connection -*/ +*/ __u32 ksnc_myipaddr;/* my IP */ __u32 ksnc_ipaddr;/* peer's IP */ int ksnc_port;/* peer's port */
Signature · 1 line
2.7.4
PATCH 3/5 staging/lustre: Convert all bare unsigned to unsigned int
In reply to Oleg DrokinHighlighted by relatively new checkpatch test, warnings like:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
--- drivers/staging/lustre/include/linux/lnet/lnetst.h | 6 +- .../staging/lustre/lustre/include/lprocfs_status.h | 3 +- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 8 +- drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- drivers/staging/lustre/lustre/llite/rw26.c | 4 +- drivers/staging/lustre/lustre/llite/xattr_cache.c | 6 +- drivers/staging/lustre/lustre/lov/lov_pool.c | 3 +- .../lustre/lustre/obdclass/lprocfs_status.c | 3 +- drivers/staging/lustre/lustre/obdclass/lu_object.c | 6 +- .../staging/lustre/lustre/obdclass/obd_config.c | 4 +- drivers/staging/lustre/lustre/osc/osc_lock.c | 2 +- drivers/staging/lustre/lustre/osc/osc_quota.c | 4 +- drivers/staging/lustre/lustre/osc/osc_request.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/connection.c | 4 +- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 4 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 92 +++++++++++----------- 17 files changed, 83 insertions(+), 80 deletions(-)
drivers/staging/lustre/include/linux/lnet/lnetst.h +3 -3
@@ -244,7 +244,7 @@ typedef struct {int lstio_ses_timeout;/* IN: session timeout */ int lstio_ses_force;/* IN: force create ? */ /** IN: session features */ -unsigned lstio_ses_feats; +unsigned int lstio_ses_feats;lst_sid_t __user *lstio_ses_idp;/* OUT: session id */ int lstio_ses_nmlen;/* IN: name length */ char __user *lstio_ses_namep;/* IN: session name */
@@ -255,7 +255,7 @@ typedef struct {lst_sid_t __user *lstio_ses_idp;/* OUT: session id */ int __user *lstio_ses_keyp;/* OUT: local key */ /** OUT: session features */ -unsigned __user *lstio_ses_featp; +unsigned int __user *lstio_ses_featp;lstcon_ndlist_ent_t __user *lstio_ses_ndinfo;/* OUT: */ int lstio_ses_nmlen;/* IN: name length */ char __user *lstio_ses_namep;/* OUT: session name */
@@ -328,7 +328,7 @@ typedef struct {char __user *lstio_grp_namep;/* IN: group name */ int lstio_grp_count;/* IN: # of nodes */ /** OUT: session features */ -unsigned __user *lstio_grp_featp; +unsigned int __user *lstio_grp_featp;lnet_process_id_t __user *lstio_grp_idsp;/* IN: nodes */ struct list_head __user *lstio_grp_resultp;/* OUT: list head of result buffer */
drivers/staging/lustre/lustre/include/lprocfs_status.h +2 -1
@@ -542,7 +542,8 @@ lprocfs_alloc_stats(unsigned int num, enum lprocfs_stats_flags flags);void lprocfs_clear_stats (struct lprocfs_stats *stats);void lprocfs_free_stats (struct lprocfs_stats **stats);void lprocfs_counter_init (struct lprocfs_stats *stats,int index, -unsigned conf,const char *name,const char *units); +unsigned int conf,const char *name, +const char *units);struct obd_export ;int lprocfs_exp_cleanup (struct obd_export *exp); struct dentry *ldebugfs_add_simple(struct dentry *root,
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +4 -4
@@ -445,8 +445,8 @@ static struct ldlm_resource *ldlm_resource_getref(struct ldlm_resource *res)return res; } -static unsigned ldlm_res_hop_hash (struct cfs_hash *hs, -const void *key,unsigned mask) +static unsigned int ldlm_res_hop_hash (struct cfs_hash *hs, +const void *key,unsigned int mask) {const struct ldlm_res_id *id = key;unsigned int val =0 ;
@@ -457,8 +457,8 @@ static unsigned ldlm_res_hop_hash(struct cfs_hash *hs,return val & mask; } -static unsigned ldlm_res_hop_fid_hash (struct cfs_hash *hs, -const void *key,unsigned mask) +static unsigned int ldlm_res_hop_fid_hash (struct cfs_hash *hs, +const void *key,unsigned int mask) {const struct ldlm_res_id *id = key;struct lu_fid fid;
drivers/staging/lustre/lustre/llite/llite_nfs.c +1 -1
@@ -226,7 +226,7 @@ static int ll_encode_fh(struct inode *inode, __u32 *fh, int *plen,static int ll_nfs_get_name_filldir (struct dir_context *ctx,const char *name,int namelen,loff_t hash,u64 ino, -unsigned type) +unsigned int type) {/* It is hack to access lde_fid for comparison with lgd_fid. * So the input 'name' must be part of the 'lu_dirent'.
drivers/staging/lustre/lustre/llite/rw26.c +2 -2
@@ -460,7 +460,7 @@ static int ll_prepare_partial_page(const struct lu_env *env, struct cl_io *io, }static int ll_write_begin (struct file *file,struct address_space *mapping, -loff_t pos,unsigned len,unsigned flags, +loff_t pos,unsigned int len,unsigned int flags,struct page **pagep,void **fsdata) {struct ll_cl_context *lcc;
@@ -577,7 +577,7 @@ static int ll_write_end(struct file *file, struct address_space *mapping,struct cl_io *io;struct vvp_io *vio;struct cl_page *page; -unsigned from = pos & (PAGE_SIZE -1 ); +unsigned int from = pos & (PAGE_SIZE -1 );bool unplug = false;int result =0 ;
drivers/staging/lustre/lustre/llite/xattr_cache.c +3 -3
@@ -26,8 +26,8 @@ struct ll_xattr_entry {*/ char *xe_name;/* xattr name, \0-terminated */ char *xe_value;/* xattr value */ -unsigned xe_namelen;/* strlen(xe_name) + 1 */ -unsigned xe_vallen;/* xattr value length */ +unsigned int xe_namelen;/* strlen(xe_name) + 1 */ +unsigned int xe_vallen;/* xattr value length */ };static struct kmem_cache *xattr_kmem;
@@ -104,7 +104,7 @@ static int ll_xattr_cache_find(struct list_head *cache,static int ll_xattr_cache_add (struct list_head *cache,const char *xattr_name,const char *xattr_val, -unsigned xattr_val_len) +unsigned int xattr_val_len) {struct ll_xattr_entry *xattr;
drivers/staging/lustre/lustre/lov/lov_pool.c +2 -1
@@ -81,7 +81,8 @@ static void lov_pool_putref_locked(struct pool_desc *pool)* Chapter 6.4. * Addison Wesley, 1973 */ -static __u32 pool_hashfn (struct cfs_hash *hash_body,const void *key,unsigned mask) +static __u32 pool_hashfn (struct cfs_hash *hash_body,const void *key, +unsigned int mask) {int i;__u32 result;
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c +2 -1
@@ -1289,7 +1289,8 @@ int ldebugfs_register_stats(struct dentry *parent, const char *name,EXPORT_SYMBOL_GPL (ldebugfs_register_stats);void lprocfs_counter_init (struct lprocfs_stats *stats,int index, -unsigned conf,const char *name,const char *units) +unsigned int conf,const char *name, +const char *units) {struct lprocfs_counter_header *header;struct lprocfs_counter *percpu_cntr;
drivers/staging/lustre/lustre/obdclass/lu_object.c +3 -3
@@ -914,8 +914,8 @@ static unsigned long lu_htable_order(struct lu_device *top)return clamp_t (typeof (bits), bits,LU_SITE_BITS_MIN , bits_max); } -static unsigned lu_obj_hop_hash (struct cfs_hash *hs, -const void *key,unsigned mask) +static unsigned int lu_obj_hop_hash (struct cfs_hash *hs, +const void *key,unsigned int mask) {struct lu_fid *fid = (struct lu_fid *)key;__u32 hash;
@@ -1324,7 +1324,7 @@ static atomic_t lu_key_initing_cnt = ATOMIC_INIT(0);* lu_context_refill(). No locking is provided, as initialization and shutdown * are supposed to be externally serialized. */ -static unsigned key_set_version; +static unsigned int key_set_version;/** * Register new key.
drivers/staging/lustre/lustre/obdclass/obd_config.c +2 -2
@@ -1450,8 +1450,8 @@ EXPORT_SYMBOL(class_manual_cleanup);* uuid<->export lustre hash operations */ -static unsigned -uuid_hash (struct cfs_hash *hs,const void *key,unsigned mask) +static unsigned int +uuid_hash (struct cfs_hash *hs,const void *key,unsigned int mask) {return cfs_hash_djb2_hash (((struct obd_uuid *)key)->uuid,sizeof (((struct obd_uuid *)key)->uuid), mask);
drivers/staging/lustre/lustre/osc/osc_lock.c +1 -1
@@ -188,7 +188,7 @@ static void osc_lock_lvb_update(const struct lu_env *env,struct cl_object *obj =osc2cl (osc);struct lov_oinfo *oinfo = osc->oo_oinfo;struct cl_attr *attr = &osc_env_info (env)->oti_attr; -unsigned valid; +unsigned int valid; valid =CAT_BLOCKS |CAT_ATIME |CAT_CTIME |CAT_MTIME |CAT_SIZE ;if (!lvb)
drivers/staging/lustre/lustre/osc/osc_quota.c +2 -2
@@ -134,8 +134,8 @@ int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[],/* * Hash operations for uid/gid <-> osc_quota_info */ -static unsigned -oqi_hashfn (struct cfs_hash *hs,const void *key,unsigned mask) +static unsigned int +oqi_hashfn (struct cfs_hash *hs,const void *key,unsigned int mask) {return cfs_hash_u32_hash (*((__u32 *)key), mask); }
drivers/staging/lustre/lustre/osc/osc_request.c +3 -3
@@ -908,9 +908,9 @@ static int check_write_rcs(struct ptlrpc_request *req,static inline int can_merge_pages (struct brw_page *p1,struct brw_page *p2) {if (p1->flag != p2->flag) { -unsigned mask = ~(OBD_BRW_FROM_GRANT |OBD_BRW_NOCACHE | -OBD_BRW_SYNC |OBD_BRW_ASYNC | -OBD_BRW_NOQUOTA |OBD_BRW_SOFT_SYNC ); +unsigned int mask = ~(OBD_BRW_FROM_GRANT |OBD_BRW_NOCACHE | +OBD_BRW_SYNC |OBD_BRW_ASYNC | +OBD_BRW_NOQUOTA |OBD_BRW_SOFT_SYNC );/* warn if we try to combine flags that we don't know to be * safe to combine
drivers/staging/lustre/lustre/ptlrpc/connection.c +2 -2
@@ -152,8 +152,8 @@ void ptlrpc_connection_fini(void)/* * Hash operations for net_peer<->connection */ -static unsigned -conn_hashfn (struct cfs_hash *hs,const void *key,unsigned mask) +static unsigned int +conn_hashfn (struct cfs_hash *hs,const void *key,unsigned int mask) {return cfs_hash_djb2_hash (key,sizeof (lnet_process_id_t), mask); }
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c +2 -2
@@ -479,8 +479,8 @@ static int ptlrpc_lprocfs_nrs_seq_show(struct seq_file *m, void *n)struct ptlrpc_nrs_policy *policy;struct ptlrpc_nrs_pol_info *infos;struct ptlrpc_nrs_pol_info tmp; -unsigned num_pols; -unsigned pol_idx =0 ; +unsigned int num_pols; +unsigned int pol_idx =0 ;bool hp = false;int i;int rc =0 ;
drivers/staging/lustre/lustre/ptlrpc/service.c +3 -3
@@ -343,9 +343,9 @@ ptlrpc_server_nthreads_check(struct ptlrpc_service *svc, struct ptlrpc_service_conf *conf) {struct ptlrpc_service_thr_conf *tc = &conf->psc_thr; -unsigned init; -unsigned total; -unsigned nthrs; +unsigned int init; +unsigned int total; +unsigned int nthrs;int weight;/*
drivers/staging/lustre/lustre/ptlrpc/wiretest.c +46 -46
180 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 4/5 staging/lustre/o2iblnd: Fix misspelling intialized->intialized
In reply to Oleg DrokinHighlighted by checkpatch:
+ if (!ps->ps_net) /* intialized? */
--- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +2 -2
@@ -1489,7 +1489,7 @@ static int kiblnd_create_fmr_pool(struct kib_fmr_poolset *fps,static void kiblnd_fail_fmr_poolset (struct kib_fmr_poolset *fps,struct list_head *zombies) { -if (!fps->fps_net)/* intialized? */ +if (!fps->fps_net)/* initialized? */ return ;spin_lock (&fps->fps_lock);
@@ -1812,7 +1812,7 @@ static void kiblnd_destroy_pool_list(struct list_head *head)static void kiblnd_fail_poolset (struct kib_poolset *ps,struct list_head *zombies) { -if (!ps->ps_net)/* intialized? */ +if (!ps->ps_net)/* initialized? */ return ;spin_lock (&ps->ps_lock);
Signature · 1 line
2.7.4
PATCH 5/5 staging/lustre/o2iblnd: Fix misspelled attemps->attempts
In reply to Oleg DrokinHighlighted by checkpatch:
WARNING: 'attemps' may be misspelled - perhaps 'attempts'? #20278: FILE: drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:3272:
+ * reconnection attemps.
--- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +1 -1
@@ -3269,7 +3269,7 @@ kiblnd_disconnect_conn(struct kib_conn *conn)#define KIB_RECONN_HIGH_RACE 10/** * Allow connd to take a break and handle other things after consecutive -* reconnection attemps. +* reconnection attempts. */ #define KIB_RECONN_BREAK 100
Signature · 1 line
2.7.4