Fix various coding style problem
PATCH 1/1 Fix various coding style problem
1) do not initialise globals to NULL
2) improve readability of hlist_for_each_entry_safe()
3) move */ to a separate line
4) change symbol == NULL to !symbol
--- drivers/staging/lustre/lustre/llite/remote_perm.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/staging/lustre/lustre/llite/remote_perm.c +8 -9
@@ -54,8 +54,8 @@#include "../include/lustre_param.h" #include "llite_internal.h" -struct kmem_cache *ll_remote_perm_cachep =NULL ; -struct kmem_cache *ll_rmtperm_hash_cachep =NULL ; +struct kmem_cache *ll_remote_perm_cachep; +struct kmem_cache *ll_rmtperm_hash_cachep;static inline struct ll_remote_perm *alloc_ll_remote_perm (void ) {
@@ -104,8 +104,7 @@ void free_rmtperm_hash(struct hlist_head *hash)return ;for (i =0 ; i <REMOTE_PERM_HASHSIZE ; i++) -hlist_for_each_entry_safe (lrp, next, hash + i, - lrp_list) +hlist_for_each_entry_safe (lrp, next, hash + i, lrp_list)free_ll_remote_perm (lrp);OBD_SLAB_FREE (hash, ll_rmtperm_hash_cachep,REMOTE_PERM_HASHSIZE *sizeof (*hash));
@@ -117,7 +116,8 @@ static inline int remote_perm_hashfunc(uid_t uid) }/* NB: setxid permission is not checked here, instead it's done on -* MDT when client get remote permission. */ +* MDT when client get remote permission. +*/ static int do_check_remote_perm (struct ll_inode_info *lli,int mask) {struct hlist_head *head;
@@ -184,7 +184,7 @@ int ll_update_remote_perm(struct inode *inode, struct mdt_remote_perm *perm)if (!lli->lli_remote_perms) { perm_hash =alloc_rmtperm_hash (); -if (perm_hash ==NULL ) { +if (!perm_hash) {CERROR ("alloc lli_remote_perms failed!\n" );return -ENOMEM ; }
@@ -287,7 +287,7 @@ int lustre_check_remote_perm(struct inode *inode, int mask) perm =req_capsule_server_swab_get (&req->rq_pill, &RMF_ACL , lustre_swab_mdt_remote_perm); -if (unlikely (perm ==NULL )) { +if (unlikely (!perm)) {mutex_unlock (&lli->lli_rmtperm_mutex); rc = -EPROTO ;break ;
@@ -321,8 +321,7 @@ void ll_free_remote_perms(struct inode *inode)spin_lock (&lli->lli_lock);for (i =0 ; i <REMOTE_PERM_HASHSIZE ; i++) { -hlist_for_each_entry_safe (lrp, node, next, hash + i, - lrp_list) +hlist_for_each_entry_safe (lrp, node, next, hash + i, lrp_list)free_ll_remote_perm (lrp); }
Signature · 1 line
2.1.4
Quoted 4 lines · Swee Hua Law
1) do not initialise globals to NULL
2) improve readability ofhlist_for_each_entry_safe()
3) move */ to a separate line
4) change symbol == NULL to !symbol
These were many different changes in a single patch. Please break them into separate patches and send it in a series.
regards
sudip
v2 cover staging: lustre: split checkpatch fix for remote_perm.c into series
In reply to Swee Hua LawSplit patch into series.
Fix various coding style issue in remote_perm.c:
[PATCH V2 1/4] staging: lustre: checkpatch: do not init global to NULL [PATCH V2 2/4] staging: lustre: checkpatch: symbol == NULL should be !symbol [PATCH V2 3/4] staging: lustre: checkpatch: move */ block comment to next line [PATCH V2 4/4] staging: lustre: checkpatch: argument alignment for readability
PATCH v2 1/4 staging: lustre: checkpatch: do not init global to NULL
Fix checkpatch problem: remove NULL assignment fro global variable
--- drivers/staging/lustre/lustre/llite/remote_perm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/llite/remote_perm.c +2 -2
@@ -54,8 +54,8 @@#include "../include/lustre_param.h" #include "llite_internal.h" -struct kmem_cache *ll_remote_perm_cachep =NULL ; -struct kmem_cache *ll_rmtperm_hash_cachep =NULL ; +struct kmem_cache *ll_remote_perm_cachep; +struct kmem_cache *ll_rmtperm_hash_cachep;static inline struct ll_remote_perm *alloc_ll_remote_perm (void ) {
Signature · 1 line
2.1.4
PATCH v2 2/4 staging: lustre: checkpatch: symbol == NULL should be !symbol
In reply to Swee Hua LawFix checkpatch problem: change == NULL comparison to !symbol
--- drivers/staging/lustre/lustre/llite/remote_perm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/llite/remote_perm.c +2 -2
@@ -184,7 +184,7 @@ int ll_update_remote_perm(struct inode *inode, struct mdt_remote_perm *perm)if (!lli->lli_remote_perms) { perm_hash =alloc_rmtperm_hash (); -if (perm_hash ==NULL ) { +if (!perm_hash) {CERROR ("alloc lli_remote_perms failed!\n" );return -ENOMEM ; }
@@ -287,7 +287,7 @@ int lustre_check_remote_perm(struct inode *inode, int mask) perm =req_capsule_server_swab_get (&req->rq_pill, &RMF_ACL , lustre_swab_mdt_remote_perm); -if (unlikely (perm ==NULL )) { +if (unlikely (!perm)) {mutex_unlock (&lli->lli_rmtperm_mutex); rc = -EPROTO ;break ;
Signature · 1 line
2.1.4
PATCH v2 3/4 staging: lustre: checkpatch: move */ block comment to next line
In reply to Swee Hua LawFix checkpatch problem: move */ from end of line to new line
--- drivers/staging/lustre/lustre/llite/remote_perm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/lustre/lustre/llite/remote_perm.c +2 -1
@@ -117,7 +117,8 @@ static inline int remote_perm_hashfunc(uid_t uid) }/* NB: setxid permission is not checked here, instead it's done on -* MDT when client get remote permission. */ +* MDT when client get remote permission. +*/ static int do_check_remote_perm (struct ll_inode_info *lli,int mask) {struct hlist_head *head;
Signature · 1 line
2.1.4
PATCH v2 4/4 staging: lustre: checkpatch: argument alignment for readability
In reply to Swee Hua LawFix checkpatch problem: move last argument of the hlist..() back to same line
--- drivers/staging/lustre/lustre/llite/remote_perm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/lustre/lustre/llite/remote_perm.c +2 -4
@@ -104,8 +104,7 @@ void free_rmtperm_hash(struct hlist_head *hash)return ;for (i =0 ; i <REMOTE_PERM_HASHSIZE ; i++) -hlist_for_each_entry_safe (lrp, next, hash + i, - lrp_list) +hlist_for_each_entry_safe (lrp, next, hash + i, lrp_list)free_ll_remote_perm (lrp);OBD_SLAB_FREE (hash, ll_rmtperm_hash_cachep,REMOTE_PERM_HASHSIZE *sizeof (*hash));
@@ -322,8 +321,7 @@ void ll_free_remote_perms(struct inode *inode)spin_lock (&lli->lli_lock);for (i =0 ; i <REMOTE_PERM_HASHSIZE ; i++) { -hlist_for_each_entry_safe (lrp, node, next, hash + i, - lrp_list) +hlist_for_each_entry_safe (lrp, node, next, hash + i, lrp_list)free_ll_remote_perm (lrp); }
Signature · 1 line
2.1.4