nfsd: fix sparse warnings
PATCH 1/2 nfsd: fix sparse warnings
Add extern to nfsd/nfsd.hfs/nfsd/nfssvc.c:146:5: warning: symbol 'nfsd_nrthreads' was not declared. Should it be static? fs/nfsd/nfssvc.c:261:5: warning: symbol 'nfsd_nrpools' was not declared. Should it be static? fs/nfsd/nfssvc.c:269:5: warning: symbol 'nfsd_get_nrthreads' was not declared. Should it be static? fs/nfsd/nfssvc.c:281:5: warning: symbol 'nfsd_set_nrthreads' was not declared. Should it be static? fs/nfsd/export.c:1534:23: warning: symbol 'nfs_exports_op' was not declared. Should it be static?
Add include of auth.hfs/nfsd/auth.c:27:5: warning: symbol 'nfsd_setuser' was not declared. Should it be static?
Make static, move forward declaration closer to where it's needed. fs/nfsd/nfs4state.c:1877:1: warning: symbol 'laundromat_main' was not declared. Should it be static?
Make static, forward declaration was already marked static. fs/nfsd/nfs4idmap.c:206:1: warning: symbol 'idtoname_parse' was not declared. Should it be static? fs/nfsd/vfs.c:1156:1: warning: symbol 'nfsd_create_setattr' was not declared. Should it be static?
--- fs/nfsd/auth.c | 1 + fs/nfsd/nfs4idmap.c | 2 +- fs/nfsd/nfs4state.c | 10 +++++----- fs/nfsd/nfsctl.c | 7 ------- fs/nfsd/vfs.c | 2 +- include/linux/nfsd/nfsd.h | 8 ++++++++ 6 files changed, 16 insertions(+), 14 deletions(-)
fs/nfsd/auth.c +1 -0
@@ -10,6 +10,7 @@#include <linux/sunrpc/svcauth.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/export.h> +#include "auth.h" int nfsexp_flags (struct svc_rqst *rqstp,struct svc_export *exp) {
fs/nfsd/nfs4idmap.c +1 -1
@@ -202,7 +202,7 @@ static struct cache_detail idtoname_cache = { .alloc = ent_alloc, }; -int +static int idtoname_parse (struct cache_detail *cd,char *buf,int buflen) {struct ent ent, *res;
fs/nfsd/nfs4state.c +5 -5
@@ -1762,10 +1762,6 @@ out:return status; } -static struct workqueue_struct *laundry_wq; -static void laundromat_main (struct work_struct *); -static DECLARE_DELAYED_WORK(laundromat_work, laundromat_main); -__be32 nfsd4_renew (struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate,clientid_t *clid)
@@ -1873,7 +1869,11 @@ nfs4_laundromat(void)return clientid_val; } -void +static struct workqueue_struct *laundry_wq; +static void laundromat_main (struct work_struct *); +static DECLARE_DELAYED_WORK(laundromat_work, laundromat_main); + +static void laundromat_main (struct work_struct *not_used) {time_t t;
fs/nfsd/nfsctl.c +0 -7
@@ -149,7 +149,6 @@ static const struct file_operations transaction_ops = { .release = simple_transaction_release, }; -extern struct seq_operations nfs_exports_op;static int exports_open (struct inode *inode,struct file *file) {return seq_open (file, &nfs_exports_op);
@@ -347,8 +346,6 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size)return mesg - buf; } -extern int nfsd_nrthreads (void ); -static ssize_t write_threads (struct file *file,char *buf,size_t size) {/* if size > 0, look for a number of threads and call nfsd_svc
@@ -371,10 +368,6 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)return strlen (buf); } -extern int nfsd_nrpools (void ); -extern int nfsd_get_nrthreads (int n,int *); -extern int nfsd_set_nrthreads (int n,int *); -static ssize_t write_pool_threads (struct file *file,char *buf,size_t size) {/* if size > 0, look for an array of number of threads per node
fs/nfsd/vfs.c +1 -1
@@ -1152,7 +1152,7 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, }#endif /* CONFIG_NFSD_V3 */ -__be32 +static __be32 nfsd_create_setattr (struct svc_rqst *rqstp,struct svc_fh *resfhp,struct iattr *iap) {
include/linux/nfsd/nfsd.h +8 -0
@@ -56,12 +56,20 @@ extern struct svc_program nfsd_program;extern struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;extern struct svc_serv *nfsd_serv; + +extern struct seq_operations nfs_exports_op; +/* * Function prototypes. */ int nfsd_svc (unsigned short port,int nrservs);int nfsd_dispatch (struct svc_rqst *rqstp,__be32 *statp); +int nfsd_nrthreads (void ); +int nfsd_nrpools (void ); +int nfsd_get_nrthreads (int n,int *); +int nfsd_set_nrthreads (int n,int *); +/* nfsd/vfs.c */ int fh_lock_parent (struct svc_fh *,struct dentry *);int nfsd_racache_init (int );
Signature · 1 line
1.5.4.2.200.g99e75
J. Bruce Fields
AppliedQuoted 10 lines · Harvey Harrison
Add extern to
nfsd/nfsd.hfs/nfsd/nfssvc.c:146:5: warning: symbol 'nfsd_nrthreads' was not declared. Should it be static?fs/nfsd/nfssvc.c:261:5: warning: symbol 'nfsd_nrpools' was not declared. Should it be static?fs/nfsd/nfssvc.c:269:5: warning: symbol 'nfsd_get_nrthreads' was not declared. Should it be static?fs/nfsd/nfssvc.c:281:5: warning: symbol 'nfsd_set_nrthreads' was not declared. Should it be static?fs/nfsd/export.c:1534:23: warning: symbol 'nfs_exports_op' was not declared. Should it be static?Add include of
auth.hfs/nfsd/auth.c:27:5: warning: symbol 'nfsd_setuser' was not declared. Should it be static?
Quoted 6 lines
Make static, move forward declaration closer to where it's needed.
fs/nfsd/nfs4state.c:1877:1: warning: symbol 'laundromat_main' was not declared. Should it be static?Make static, forward declaration was already marked static.
fs/nfsd/nfs4idmap.c:206:1: warning: symbol 'idtoname_parse' was not declared. Should it be static?fs/nfsd/vfs.c:1156:1: warning: symbol 'nfsd_create_setattr' was not declared. Should it be static?
Applied, thanks.
--b.
Quoted 138 lines
Signed-off-by Harvey Harrison <[email protected]>--- fs/nfsd/auth.c | 1 + fs/nfsd/nfs4idmap.c | 2 +- fs/nfsd/nfs4state.c | 10 +++++----- fs/nfsd/nfsctl.c | 7 ------- fs/nfsd/vfs.c | 2 +- include/linux/nfsd/nfsd.h | 8 ++++++++ 6 files changed, 16 insertions(+), 14 deletions(-)fs/nfsd/auth.c +1
-0@@ -10,6 +10,7 @@#include <linux/sunrpc/svcauth.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/export.h> +#include "auth.h" int nfsexp_flags (struct svc_rqst *rqstp,struct svc_export *exp) {fs/nfsd/nfs4idmap.c +1
-1@@ -202,7 +202,7 @@ static struct cache_detail idtoname_cache = { .alloc = ent_alloc, }; -int +static int idtoname_parse (struct cache_detail *cd,char *buf,int buflen) {struct ent ent, *res;fs/nfsd/nfs4state.c +5
-5@@ -1762,10 +1762,6 @@ out:return status; } -static struct workqueue_struct *laundry_wq; -static void laundromat_main (struct work_struct *); -static DECLARE_DELAYED_WORK(laundromat_work, laundromat_main); -__be32 nfsd4_renew (struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate,clientid_t *clid)@@ -1873,7 +1869,11 @@ nfs4_laundromat(void)return clientid_val; } -void +static struct workqueue_struct *laundry_wq; +static void laundromat_main (struct work_struct *); +static DECLARE_DELAYED_WORK(laundromat_work, laundromat_main); + +static void laundromat_main (struct work_struct *not_used) {time_t t;fs/nfsd/nfsctl.c +0
-7@@ -149,7 +149,6 @@ static const struct file_operations transaction_ops = { .release = simple_transaction_release, }; -extern struct seq_operations nfs_exports_op;static int exports_open (struct inode *inode,struct file *file) {return seq_open (file, &nfs_exports_op);@@ -347,8 +346,6 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size)return mesg - buf; } -extern int nfsd_nrthreads (void ); -static ssize_t write_threads (struct file *file,char *buf,size_t size) {/* if size > 0, look for a number of threads and call nfsd_svc @@ -371,10 +368,6 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)return strlen (buf); } -extern int nfsd_nrpools (void ); -extern int nfsd_get_nrthreads (int n,int *); -extern int nfsd_set_nrthreads (int n,int *); -static ssize_t write_pool_threads (struct file *file,char *buf,size_t size) {/* if size > 0, look for an array of number of threads per node fs/nfsd/vfs.c +1
-1@@ -1152,7 +1152,7 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, }#endif /* CONFIG_NFSD_V3 */ -__be32 +static __be32 nfsd_create_setattr (struct svc_rqst *rqstp,struct svc_fh *resfhp,struct iattr *iap) {include/linux/nfsd/nfsd.h +8
-0@@ -56,12 +56,20 @@ extern struct svc_program nfsd_program;extern struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;extern struct svc_serv *nfsd_serv; + +extern struct seq_operations nfs_exports_op; +/* * Function prototypes. */ int nfsd_svc (unsigned short port,int nrservs);int nfsd_dispatch (struct svc_rqst *rqstp,__be32 *statp); +int nfsd_nrthreads (void ); +int nfsd_nrpools (void ); +int nfsd_get_nrthreads (int n,int *); +int nfsd_set_nrthreads (int n,int *); +/* nfsd/vfs.c */ int fh_lock_parent (struct svc_fh *,struct dentry *);int nfsd_racache_init (int );Signature · 1 line
1.5.4.2.200.g99e75