Commit a254b246 authored by Harvey Harrison's avatar Harvey Harrison Committed by J. Bruce Fields

nfsd: fix sparse warnings

Add extern to nfsd/nfsd.h
fs/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.h
fs/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?
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent d8421202
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/sunrpc/svcauth.h> #include <linux/sunrpc/svcauth.h>
#include <linux/nfsd/nfsd.h> #include <linux/nfsd/nfsd.h>
#include <linux/nfsd/export.h> #include <linux/nfsd/export.h>
#include "auth.h"
int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp) int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)
{ {
......
...@@ -202,7 +202,7 @@ static struct cache_detail idtoname_cache = { ...@@ -202,7 +202,7 @@ static struct cache_detail idtoname_cache = {
.alloc = ent_alloc, .alloc = ent_alloc,
}; };
int static int
idtoname_parse(struct cache_detail *cd, char *buf, int buflen) idtoname_parse(struct cache_detail *cd, char *buf, int buflen)
{ {
struct ent ent, *res; struct ent ent, *res;
......
...@@ -1763,10 +1763,6 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf ...@@ -1763,10 +1763,6 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
return status; return status;
} }
static struct workqueue_struct *laundry_wq;
static void laundromat_main(struct work_struct *);
static DECLARE_DELAYED_WORK(laundromat_work, laundromat_main);
__be32 __be32
nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
clientid_t *clid) clientid_t *clid)
...@@ -1874,7 +1870,11 @@ nfs4_laundromat(void) ...@@ -1874,7 +1870,11 @@ nfs4_laundromat(void)
return clientid_val; 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) laundromat_main(struct work_struct *not_used)
{ {
time_t t; time_t t;
......
...@@ -150,7 +150,6 @@ static const struct file_operations transaction_ops = { ...@@ -150,7 +150,6 @@ static const struct file_operations transaction_ops = {
.release = simple_transaction_release, .release = simple_transaction_release,
}; };
extern struct seq_operations nfs_exports_op;
static int exports_open(struct inode *inode, struct file *file) static int exports_open(struct inode *inode, struct file *file)
{ {
return seq_open(file, &nfs_exports_op); return seq_open(file, &nfs_exports_op);
...@@ -358,8 +357,6 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size) ...@@ -358,8 +357,6 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size)
return mesg - buf; return mesg - buf;
} }
extern int nfsd_nrthreads(void);
static ssize_t write_threads(struct file *file, char *buf, size_t size) 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 /* if size > 0, look for a number of threads and call nfsd_svc
...@@ -382,10 +379,6 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size) ...@@ -382,10 +379,6 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)
return strlen(buf); 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) 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 /* if size > 0, look for an array of number of threads per node
......
...@@ -56,12 +56,20 @@ extern struct svc_program nfsd_program; ...@@ -56,12 +56,20 @@ extern struct svc_program nfsd_program;
extern struct svc_version nfsd_version2, nfsd_version3, extern struct svc_version nfsd_version2, nfsd_version3,
nfsd_version4; nfsd_version4;
extern struct svc_serv *nfsd_serv; extern struct svc_serv *nfsd_serv;
extern struct seq_operations nfs_exports_op;
/* /*
* Function prototypes. * Function prototypes.
*/ */
int nfsd_svc(unsigned short port, int nrservs); int nfsd_svc(unsigned short port, int nrservs);
int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp); 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 */ /* nfsd/vfs.c */
int fh_lock_parent(struct svc_fh *, struct dentry *); int fh_lock_parent(struct svc_fh *, struct dentry *);
int nfsd_racache_init(int); int nfsd_racache_init(int);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment