| Message ID | 20210316195833.5063-1-namrata.janawade@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: sunrpc: fixed function and extra line coding styles | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 8 of 8 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | fail | ERROR: trailing whitespace |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
On Tue, 2021-03-16 at 12:58 -0700, namratajanawade wrote: > Block comments written in format suggested by checkpatch.pl. > Removed trailing semicolon in macros definition as macros should not > use a trailing semicolon. > Open braces shifted to new line (as suggested by checkpatch.pl). > > Signed-off-by: namratajanawade <namrata.janawade@gmail.com> > --- > net/sunrpc/auth.c | 36 ++++++++++++++---------------------- > 1 file changed, 14 insertions(+), 22 deletions(-) > > diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c > index a9f0d17fdb0d..6ef9481a0d2d 100644 > --- a/net/sunrpc/auth.c > +++ b/net/sunrpc/auth.c > @@ -45,8 +45,7 @@ static struct cred machine_cred = { > #endif > }; > > -/* > - * Return the machine_cred pointer to be used whenever > +/* Return the machine_cred pointer to be used whenever > * the a generic machine credential is needed. > */ > const struct cred *rpc_machine_cred(void) > @@ -84,7 +83,7 @@ static int param_get_hashtbl_sz(char *buffer, const > struct kernel_param *kp) > return sprintf(buffer, "%u\n", 1U << nbits); > } > > -#define param_check_hashtbl_sz(name, p) __param_check(name, p, > unsigned int); > +#define param_check_hashtbl_sz(name, p) __param_check(name, p, > unsigned int) > > static const struct kernel_param_ops param_ops_hashtbl_sz = { > .set = param_set_hashtbl_sz, > @@ -99,7 +98,8 @@ module_param(auth_max_cred_cachesize, ulong, 0644); > MODULE_PARM_DESC(auth_max_cred_cachesize, "RPC credential maximum > total cache size"); > > static u32 > -pseudoflavor_to_flavor(u32 flavor) { > +pseudoflavor_to_flavor(u32 flavor) > +{ > if (flavor > RPC_AUTH_MAXFLAVOR) > return RPC_AUTH_GSS; > return flavor; > @@ -256,8 +256,7 @@ rpcauth_release(struct rpc_auth *auth) > > static DEFINE_SPINLOCK(rpc_credcache_lock); > > -/* > - * On success, the caller is responsible for freeing the reference > +/* On success, the caller is responsible for freeing the reference > * held by the hashtable > */ > static bool > @@ -284,8 +283,7 @@ rpcauth_unhash_cred(struct rpc_cred *cred) > return ret; > } > > -/* > - * Initialize RPC credential cache > +/* Initialize RPC credential cache > */ > int > rpcauth_init_credcache(struct rpc_auth *auth) > @@ -320,8 +318,7 @@ rpcauth_stringify_acceptor(struct rpc_cred *cred) > } > EXPORT_SYMBOL_GPL(rpcauth_stringify_acceptor); > > -/* > - * Destroy a list of credentials > +/* Destroy a list of credentials > */ > static inline > void rpcauth_destroy_credlist(struct list_head *head) > @@ -373,8 +370,7 @@ rpcauth_lru_remove(struct rpc_cred *cred) > spin_unlock(&rpc_credcache_lock); > } > > -/* > - * Clear the RPC credential cache, and delete those credentials > +/* Clear the RPC credential cache, and delete those credentials > * that are not referenced. > */ > void > @@ -403,8 +399,7 @@ rpcauth_clear_credcache(struct rpc_cred_cache > *cache) > rpcauth_destroy_credlist(&free); > } > > -/* > - * Destroy the RPC credential cache > +/* Destroy the RPC credential cache > */ > void > rpcauth_destroy_credcache(struct rpc_auth *auth) > @@ -423,8 +418,7 @@ EXPORT_SYMBOL_GPL(rpcauth_destroy_credcache); > > #define RPC_AUTH_EXPIRY_MORATORIUM (60 * HZ) > > -/* > - * Remove stale credentials. Avoid sleeping inside the loop. > +/* Remove stale credentials. Avoid sleeping inside the loop. > */ > static long > rpcauth_prune_expired(struct list_head *free, int nr_to_scan) > @@ -441,8 +435,7 @@ rpcauth_prune_expired(struct list_head *free, int > nr_to_scan) > rpcauth_lru_remove_locked(cred); > continue; > } > - /* > - * Enforce a 60 second garbage collection moratorium > + /* Enforce a 60 second garbage collection moratorium > * Note that the cred_unused list must be time- > ordered. > */ > if (!time_in_range(cred->cr_expire, expired, > jiffies)) > @@ -471,8 +464,7 @@ rpcauth_cache_do_shrink(int nr_to_scan) > return freed; > } > > -/* > - * Run memory cache shrinker. > +/* Run memory cache shrinker. > */ > static unsigned long > rpcauth_cache_shrink_scan(struct shrinker *shrink, struct > shrink_control *sc) > @@ -510,8 +502,7 @@ rpcauth_cache_enforce_limit(void) > rpcauth_cache_do_shrink(nr_to_scan); > } > > -/* > - * Look up a process' credentials in the authentication cache > +/* Look up a process' credentials in the authentication cache > */ > struct rpc_cred * > rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * > acred, > @@ -566,6 +557,7 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, > struct auth_cred * acred, > cred->cr_ops->cr_init != NULL && > !(flags & RPCAUTH_LOOKUP_NEW)) { > int res = cred->cr_ops->cr_init(auth, cred); > + > if (res < 0) { > put_rpccred(cred); > cred = ERR_PTR(res); NACK. This is not consistent with the preferred style for NFS and SUNRPC (or the preferred style in Documentation/process/coding- style.rst).
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index a9f0d17fdb0d..6ef9481a0d2d 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -45,8 +45,7 @@ static struct cred machine_cred = { #endif }; -/* - * Return the machine_cred pointer to be used whenever +/* Return the machine_cred pointer to be used whenever * the a generic machine credential is needed. */ const struct cred *rpc_machine_cred(void) @@ -84,7 +83,7 @@ static int param_get_hashtbl_sz(char *buffer, const struct kernel_param *kp) return sprintf(buffer, "%u\n", 1U << nbits); } -#define param_check_hashtbl_sz(name, p) __param_check(name, p, unsigned int); +#define param_check_hashtbl_sz(name, p) __param_check(name, p, unsigned int) static const struct kernel_param_ops param_ops_hashtbl_sz = { .set = param_set_hashtbl_sz, @@ -99,7 +98,8 @@ module_param(auth_max_cred_cachesize, ulong, 0644); MODULE_PARM_DESC(auth_max_cred_cachesize, "RPC credential maximum total cache size"); static u32 -pseudoflavor_to_flavor(u32 flavor) { +pseudoflavor_to_flavor(u32 flavor) +{ if (flavor > RPC_AUTH_MAXFLAVOR) return RPC_AUTH_GSS; return flavor; @@ -256,8 +256,7 @@ rpcauth_release(struct rpc_auth *auth) static DEFINE_SPINLOCK(rpc_credcache_lock); -/* - * On success, the caller is responsible for freeing the reference +/* On success, the caller is responsible for freeing the reference * held by the hashtable */ static bool @@ -284,8 +283,7 @@ rpcauth_unhash_cred(struct rpc_cred *cred) return ret; } -/* - * Initialize RPC credential cache +/* Initialize RPC credential cache */ int rpcauth_init_credcache(struct rpc_auth *auth) @@ -320,8 +318,7 @@ rpcauth_stringify_acceptor(struct rpc_cred *cred) } EXPORT_SYMBOL_GPL(rpcauth_stringify_acceptor); -/* - * Destroy a list of credentials +/* Destroy a list of credentials */ static inline void rpcauth_destroy_credlist(struct list_head *head) @@ -373,8 +370,7 @@ rpcauth_lru_remove(struct rpc_cred *cred) spin_unlock(&rpc_credcache_lock); } -/* - * Clear the RPC credential cache, and delete those credentials +/* Clear the RPC credential cache, and delete those credentials * that are not referenced. */ void @@ -403,8 +399,7 @@ rpcauth_clear_credcache(struct rpc_cred_cache *cache) rpcauth_destroy_credlist(&free); } -/* - * Destroy the RPC credential cache +/* Destroy the RPC credential cache */ void rpcauth_destroy_credcache(struct rpc_auth *auth) @@ -423,8 +418,7 @@ EXPORT_SYMBOL_GPL(rpcauth_destroy_credcache); #define RPC_AUTH_EXPIRY_MORATORIUM (60 * HZ) -/* - * Remove stale credentials. Avoid sleeping inside the loop. +/* Remove stale credentials. Avoid sleeping inside the loop. */ static long rpcauth_prune_expired(struct list_head *free, int nr_to_scan) @@ -441,8 +435,7 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan) rpcauth_lru_remove_locked(cred); continue; } - /* - * Enforce a 60 second garbage collection moratorium + /* Enforce a 60 second garbage collection moratorium * Note that the cred_unused list must be time-ordered. */ if (!time_in_range(cred->cr_expire, expired, jiffies)) @@ -471,8 +464,7 @@ rpcauth_cache_do_shrink(int nr_to_scan) return freed; } -/* - * Run memory cache shrinker. +/* Run memory cache shrinker. */ static unsigned long rpcauth_cache_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) @@ -510,8 +502,7 @@ rpcauth_cache_enforce_limit(void) rpcauth_cache_do_shrink(nr_to_scan); } -/* - * Look up a process' credentials in the authentication cache +/* Look up a process' credentials in the authentication cache */ struct rpc_cred * rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, @@ -566,6 +557,7 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, cred->cr_ops->cr_init != NULL && !(flags & RPCAUTH_LOOKUP_NEW)) { int res = cred->cr_ops->cr_init(auth, cred); + if (res < 0) { put_rpccred(cred); cred = ERR_PTR(res);
Block comments written in format suggested by checkpatch.pl. Removed trailing semicolon in macros definition as macros should not use a trailing semicolon. Open braces shifted to new line (as suggested by checkpatch.pl). Signed-off-by: namratajanawade <namrata.janawade@gmail.com> --- net/sunrpc/auth.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-)