Commit dd074e20 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] nfsd: global/static cleanups for nfsd

The patch below contains the following cleanups:
- make some needlessly global code static
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c59e02e1
......@@ -79,7 +79,7 @@ void expkey_put(struct cache_head *item, struct cache_detail *cd)
}
}
void expkey_request(struct cache_detail *cd,
static void expkey_request(struct cache_detail *cd,
struct cache_head *h,
char **bpp, int *blen)
{
......@@ -95,7 +95,7 @@ void expkey_request(struct cache_detail *cd,
}
static struct svc_expkey *svc_expkey_lookup(struct svc_expkey *, int);
int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
{
/* client fsidtype fsid [path] */
char *buf;
......@@ -284,7 +284,7 @@ void svc_export_put(struct cache_head *item, struct cache_detail *cd)
}
}
void svc_export_request(struct cache_detail *cd,
static void svc_export_request(struct cache_detail *cd,
struct cache_head *h,
char **bpp, int *blen)
{
......@@ -340,7 +340,7 @@ static int check_export(struct inode *inode, int flags)
}
int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
{
/* client path expiry [flags anonuid anongid fsid] */
char *buf;
......@@ -510,7 +510,7 @@ exp_find_key(svc_client *clp, int fsid_type, u32 *fsidv, struct cache_req *reqp)
return ek;
}
int exp_set_key(svc_client *clp, int fsid_type, u32 *fsidv,
static int exp_set_key(svc_client *clp, int fsid_type, u32 *fsidv,
struct svc_export *exp)
{
struct svc_expkey key, *ek;
......@@ -999,7 +999,7 @@ static void e_stop(struct seq_file *m, void *p)
exp_readunlock();
}
struct flags {
static struct flags {
int flag;
char *name[2];
} expflags[] = {
......
......@@ -60,7 +60,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
struct nlmsvc_binding nfsd_nlm_ops = {
static struct nlmsvc_binding nfsd_nlm_ops = {
.fopen = nlm_fopen, /* open file for locking */
.fclose = nlm_fclose, /* close file */
};
......
......@@ -41,7 +41,7 @@ extern struct export_operations export_op_default;
* if not, require that we can walk up to exp->ex_dentry
* doing some checks on the 'x' bits
*/
int nfsd_acceptable(void *expv, struct dentry *dentry)
static int nfsd_acceptable(void *expv, struct dentry *dentry)
{
struct svc_export *exp = expv;
int rv;
......@@ -280,7 +280,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
* an inode. In this case a call to fh_update should be made
* before the fh goes out on the wire ...
*/
inline int _fh_update(struct dentry *dentry, struct svc_export *exp,
static inline int _fh_update(struct dentry *dentry, struct svc_export *exp,
__u32 *datap, int *maxsize)
{
struct export_operations *nop = exp->ex_mnt->mnt_sb->s_export_op;
......@@ -297,7 +297,8 @@ inline int _fh_update(struct dentry *dentry, struct svc_export *exp,
/*
* for composing old style file handles
*/
inline void _fh_update_old(struct dentry *dentry, struct svc_export *exp,
static inline void _fh_update_old(struct dentry *dentry,
struct svc_export *exp,
struct knfsd_fh *fh)
{
fh->ofh_ino = ino_t_to_u32(dentry->d_inode->i_ino);
......
......@@ -60,7 +60,7 @@ struct nfsd_list {
struct list_head list;
struct task_struct *task;
};
struct list_head nfsd_list = LIST_HEAD_INIT(nfsd_list);
static struct list_head nfsd_list = LIST_HEAD_INIT(nfsd_list);
/*
* Maximum number of nfsd processes
......
......@@ -707,7 +707,7 @@ nfsd_close(struct file *filp)
* As this calls fsync (not fdatasync) there is no need for a write_inode
* after it.
*/
inline void nfsd_dosync(struct file *filp, struct dentry *dp,
static inline void nfsd_dosync(struct file *filp, struct dentry *dp,
struct file_operations *fop)
{
struct inode *inode = dp->d_inode;
......@@ -720,7 +720,7 @@ inline void nfsd_dosync(struct file *filp, struct dentry *dp,
}
void
static void
nfsd_sync(struct file *filp)
{
struct inode *inode = filp->f_dentry->d_inode;
......@@ -730,7 +730,7 @@ nfsd_sync(struct file *filp)
up(&inode->i_sem);
}
void
static void
nfsd_sync_dir(struct dentry *dp)
{
nfsd_dosync(NULL, dp, dp->d_inode->i_fop);
......
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