staging: lustre: lclient: fixing coding style issues
PATCH v6 1/1 staging: lustre: lclient: fixing coding style issues
Revised PATCH 7/8 and updated the comment, as suggested by "[email protected]"
PATCH v6 1/8 staging: lustre: lclient: glimpse.c fixing coding style issues
From: Anil Belur <[email protected]>
Fixed "ERROR: need consistent spacing around '+' (ctx:WxV)"
--- drivers/staging/lustre/lustre/lclient/glimpse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/lclient/glimpse.c +1 -1
@@ -177,7 +177,7 @@ static int cl_io_get(struct inode *inode, struct lu_env **envout, io->ci_obj = clob; *envout = env; *ioout = io; - result =+1 ; + result =1 ; }else result =PTR_ERR (env); }else
Signature · 1 line
1.9.0
PATCH v6 2/8 staging: lustre: lclient: glimpse.c fixing coding style issues
In reply to Anil BelurFrom: Anil Belur <[email protected]>
fixed "WARNING: labels should not be indented"
--- drivers/staging/lustre/lustre/lclient/glimpse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/lclient/glimpse.c +1 -1
@@ -204,7 +204,7 @@ int cl_glimpse_size0(struct inode *inode, int agl) result =cl_io_get (inode, &env, &io, &refcheck);if (result >0 ) { - again: +again: io->ci_verify_layout =1 ; result =cl_io_init (env, io,CIT_MISC , io->ci_obj);if (result >0 )
Signature · 1 line
1.9.0
PATCH v6 3/8 staging: lustre: lclient: lcommon_misc.c fixing coding style issues
In reply to Anil BelurFrom: Anil Belur <[email protected]>
fixed warning:
* WARNING: min() should probably be min_t(__u32, desc.ld_tgt_count, LOV_MAX_STRIPE_COUNT)
--- drivers/staging/lustre/lustre/lclient/lcommon_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/lclient/lcommon_misc.c +1 -1
@@ -63,7 +63,7 @@ int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)if (rc)return rc; - stripes =min (desc.ld_tgt_count, (__u32 )LOV_MAX_STRIPE_COUNT ); + stripes =min_t (__u32, desc.ld_tgt_count, (__u32 )LOV_MAX_STRIPE_COUNT ); lsm.lsm_stripe_count = stripes; easize =obd_size_diskmd (dt_exp, &lsm);
Signature · 1 line
1.9.0
Re: [PATCH v6 3/8] staging: lustre: lclient: lcommon_misc.c fixing coding style issues
Quoted 17 lines · Anil Belur
From: Anil Belur <[email protected]>
fixed warning:
* WARNING:min()should probably bemin_t(__u32, desc.ld_tgt_count, LOV_MAX_STRIPE_COUNT)Signed-off-by Anil Belur <[email protected]>---
drivers/staging/lustre/lustre/lclient/lcommon_misc.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/lustre/lustre/lclient/lcommon_misc.c +0
-0
drivers/staging/lustre/lustre/lclient/lcommon_misc.c int cl_init_ea_size(struct obd_export *md_exp, struct · line 67
Quoted 6 lines
drivers/staging/lustre/lustre/lclient/lcommon_misc.c +1
-1@@ -63,7 +63,7 @@ int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)if (rc)return rc; - stripes =min (desc.ld_tgt_count, (__u32 )LOV_MAX_STRIPE_COUNT ); + stripes =min_t (__u32, desc.ld_tgt_count, (__u32 )LOV_MAX_STRIPE_COUNT );
If you are using min_t(__u32, ...) then there is no need for the (__u32) cast ofLOV_MAX_STRIPE_COUNT, since that is the whole point of min_t() that the cast is
done internally.
Quoted 7 lines
drivers/staging/lustre/lustre/lclient/lcommon_misc.c +0
-0lsm.lsm_stripe_count = stripes; easize =obd_size_diskmd (dt_exp, &lsm);Signature · 2 lines
-- 1.9.0
Cheers, Andreas
Signature · 4 lines
Andreas Dilger Lustre Software Architect Intel High Performance Data Division
Re: [PATCH v6 3/8] staging: lustre: lclient: lcommon_misc.c fixing coding style issues
Quoted 1 line
If you are using
min_t(__u32, ...)then there is no need for the
(__u32) cast of LOV_MAX_STRIPE_COUNT, since that is the whole point of min_t() that the cast is done internally.
Agreed, it makes sense not to cast twice when using min_t().
PATCH v6 4/8 staging: lustre: lclient: lcommon_cl.c fixing coding style issues
In reply to Anil BelurFrom: Anil Belur <[email protected]>
fixed: WARNING: Missing a blank line after declarations
--- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +4 -0
@@ -126,6 +126,7 @@ void ccc_key_fini(const struct lu_context *ctx, struct lu_context_key *key, void *data) { struct ccc_thread_info *info = data; +OBD_SLAB_FREE_PTR (info, ccc_thread_kmem); }
@@ -144,6 +145,7 @@ void ccc_session_key_fini(const struct lu_context *ctx, struct lu_context_key *key, void *data) { struct ccc_session *session = data; +OBD_SLAB_FREE_PTR (session, ccc_session_kmem); }
@@ -572,6 +574,7 @@ void ccc_lock_delete(const struct lu_env *env,void ccc_lock_fini (const struct lu_env *env,struct cl_lock_slice *slice) {struct ccc_lock *clk =cl2ccc_lock (slice); +OBD_SLAB_FREE_PTR (clk, ccc_lock_kmem); }
@@ -733,6 +736,7 @@ int ccc_io_one_lock(const struct lu_env *env, struct cl_io *io, loff_t start, loff_t end) {struct cl_object *obj = io->ci_obj; +return ccc_io_one_lock_index (env, io, enqflags, mode,cl_index (obj, start),cl_index (obj, end)); }
Signature · 1 line
1.9.0
PATCH v6 5/8 staging: lustre: lclient: lcommon_cl.c fixing coding style issues
In reply to Anil BelurFrom: Anil Belur <[email protected]>
fixed: ERROR: do not initialise statics to 0 or NULL
--- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +1 -1
@@ -266,7 +266,7 @@ int ccc_req_init(const struct lu_env *env, struct cl_device *dev,* fails. Access to this environment is serialized by ccc_inode_fini_guard * mutex. */ -static struct lu_env *ccc_inode_fini_env =NULL ; +static struct lu_env *ccc_inode_fini_env;/** * A mutex serializing calls to slp_inode_fini() under extreme memory
Signature · 1 line
1.9.0
PATCH v6 6/8 staging: lustre: lclient: lcommon_cl.c fixing coding style issues
In reply to Anil BelurFrom: Anil Belur <[email protected]>
fixed: ERROR: inline keyword should sit between storage class and type
--- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +1 -1
@@ -1273,7 +1273,7 @@ struct lov_stripe_md *ccc_inode_lsm_get(struct inode *inode)return lov_lsm_get (cl_i2info (inode)->lli_clob); } -void inline ccc_inode_lsm_put (struct inode *inode,struct lov_stripe_md *lsm) +inline void ccc_inode_lsm_put (struct inode *inode,struct lov_stripe_md *lsm) {lov_lsm_put (cl_i2info (inode)->lli_clob, lsm); }
Signature · 1 line
1.9.0
PATCH v6 7/8 staging: lustre: lclient: lcommon_cl.c fixing coding style issues
In reply to Anil BelurFrom: Anil Belur <[email protected]>
fixed: WARNING: line over 80 characters, used a new variable 'size_index' to store the offset. Replaceed "unsigned long" with "loff_t" type for 'cur_index'
--- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +3 -2
@@ -821,10 +821,11 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,* linux-2.6.18-128.1.1 miss to do that. * --bug 17336 */ loff_t size =cl_isize_read (inode); -unsigned long cur_index = start >>PAGE_CACHE_SHIFT ; +loff_t cur_index = start >>PAGE_CACHE_SHIFT ; +loff_t size_index = ((size -1 ) >>PAGE_CACHE_SHIFT );if ((size ==0 && cur_index !=0 ) || - (((size -1 ) >>PAGE_CACHE_SHIFT ) < cur_index)) + (size_index < cur_index)) *exceed =1 ; }return result;
Signature · 1 line
1.9.0
Re: [PATCH v6 7/8] staging: lustre: lclient: lcommon_cl.c fixing coding style issues
Quoted 18 lines · Anil Belur
From: Anil Belur <[email protected]>
fixed: WARNING: line over 80 characters, used a new variable '
size_index' to
store the offset. Replaceed "unsigned long" with "loff_t" type for 'cur_index'Signed-off-by Anil Belur <[email protected]>---
drivers/staging/lustre/lustre/lclient/lcommon_cl.c| 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)drivers/staging/lustre/lustre/lclient/lcommon_cl.c +0
-0
drivers/staging/lustre/lustre/lclient/lcommon_cl.c int ccc_prep_size(const struct lu_env *env, struct · line 826
Quoted 7 lines
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +2
-1@@ -821,10 +821,11 @@ int ccc_prep_size(const struct lu_env *env, structcl_object *obj, * linux-2.6.18-128.1.1 miss to do that. * --bug 17336 */ loff_t size =cl_isize_read (inode); -unsigned long cur_index = start >>PAGE_CACHE_SHIFT ; +loff_t cur_index = start >>PAGE_CACHE_SHIFT ; +loff_t size_index = ((size -1 ) >>PAGE_CACHE_SHIFT );
Should be an empty line between variable declarations and code.
Quoted 11 lines
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +1
-1if ((size ==0 && cur_index !=0 ) || - (((size -1 ) >>PAGE_CACHE_SHIFT ) < cur_index)) + (size_index < cur_index)) *exceed =1 ; }return result;Signature · 1 line
1.9.0
Cheers, Andreas
Signature · 4 lines
Andreas Dilger Lustre Software Architect Intel High Performance Data Division
Re: [PATCH v6 7/8] staging: lustre: lclient: lcommon_cl.c fixing coding style issues
Quoted 1 line
Should be an empty line between variable declarations and code.
Hi Andreas, not sure if you are referring to the same patch as there is already an empty line present.
823 loff_t size = cl_isize_read(inode);
824 loff_t cur_index = start >>PAGE_CACHE_SHIFT;
825 loff_t size_index = ((size - 1) >>PAGE_CACHE_SHIFT);
826
827 if ((size == 0 && cur_index != 0) ||
Cheers,
Anil
PATCH v6 8/8 staging: lustre: lclient: lcommon_cl.c fixing coding style issues
In reply to Anil BelurFrom: Anil Belur <[email protected]>
fixed: WARNING: suspect code indent for conditional statements (32, 32)
--- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +2 -2
@@ -825,8 +825,8 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,loff_t size_index = ((size -1 ) >>PAGE_CACHE_SHIFT );if ((size ==0 && cur_index !=0 ) || - (size_index < cur_index)) - *exceed =1 ; + (size_index < cur_index)) + *exceed =1 ; }return result; }else {
Signature · 1 line
1.9.0
Re: [PATCH v6 8/8] staging: lustre: lclient: lcommon_cl.c fixing coding style issues
Quoted 14 lines · Anil Belur
From: Anil Belur <[email protected]>
fixed: WARNING: suspect code indent for conditional statements (32, 32)
Signed-off-by Anil Belur <[email protected]>---
drivers/staging/lustre/lustre/lclient/lcommon_cl.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/lustre/lustre/lclient/lcommon_cl.c +0
-0
drivers/staging/lustre/lustre/lclient/lcommon_cl.c int ccc_prep_size(const struct lu_env *env, struct · line 829
Quoted 7 lines
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +1
-2@@ -825,8 +825,8 @@ int ccc_prep_size(const struct lu_env *env, structcl_object *obj, loff_t size_index = ((size - 1) >> PAGE_CACHE_SHIFT);if ((size ==0 && cur_index !=0 ) || - (size_index < cur_index)) - *exceed =1 ; + (size_index < cur_index))
The old indentation of this line (aligned after '(' on the previous line) was better. Note also that there is no need for parenthesis around this statement.
Quoted 8 lines
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +1
-0+ *exceed =1 ; }return result;} else {Signature · 1 line
1.9.0
Cheers, Andreas
Signature · 4 lines
Andreas Dilger Lustre Software Architect Intel High Performance Data Division