fs/nfsd/: possible cleanups
Subsystems (2)
PATCH 1/1 fs/nfsd/: possible cleanups
The patch below contains the following possible cleanups:
- make some needlessly global code static
- #if 0 the following EXPORT_SYMBOL'ed but unused function:
- nfs4acl.c: nfs4_acl_permission
- remove the following unused global function:
- nfs4state.c: set_no_grace
diffstat output:
fs/nfsd/export.c | 22 +++++----- fs/nfsd/lockd.c | 2 fs/nfsd/nfs4acl.c | 9 ++-- fs/nfsd/nfs4callback.c | 7 +-- fs/nfsd/nfs4idmap.c | 12 ++--- fs/nfsd/nfs4state.c | 75 ++++++++++++++++--------------------- fs/nfsd/nfs4xdr.c | 4 - fs/nfsd/nfsfh.c | 11 ++--- fs/nfsd/nfssvc.c | 2 fs/nfsd/vfs.c | 8 +-- include/linux/nfs4_acl.h | 2 include/linux/nfsd/state.h | 1 12 files changed, 75 insertions(+), 80 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
fs/nfsd/export.c renamed from fs/nfsd/export.c.old +11 -11
@@ -79,9 +79,9 @@ } } -void expkey_request (struct cache_detail *cd, -struct cache_head *h, -char **bpp,int *blen) +static void expkey_request (struct cache_detail *cd, +struct cache_head *h, +char **bpp,int *blen) {/* client fsidtype \xfsid */ struct svc_expkey *ek = container_of(h, struct svc_expkey, h);
@@ -95,7 +95,7 @@ }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,9 +284,9 @@ } } -void svc_export_request (struct cache_detail *cd, -struct cache_head *h, -char **bpp,int *blen) +static void svc_export_request (struct cache_detail *cd, +struct cache_head *h, +char **bpp,int *blen) {/* client path */ struct svc_export *exp = container_of(h, struct svc_export, h);
@@ -345,7 +345,7 @@ } -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;
@@ -515,8 +515,8 @@return ek; } -int exp_set_key (svc_client *clp,int fsid_type,u32 *fsidv, -struct svc_export *exp) +static int exp_set_key (svc_client *clp,int fsid_type,u32 *fsidv, +struct svc_export *exp) {struct svc_expkey key, *ek;
@@ -1004,7 +1004,7 @@exp_readunlock (); } -struct flags { +static struct flags {int flag;char *name[2 ]; } expflags[] = {
fs/nfsd/lockd.c renamed from fs/nfsd/lockd.c.old +1 -1
@@ -60,7 +60,7 @@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 */ };
include/linux/nfs4_acl.h renamed from include/linux/nfs4_acl.h.old +2 -0
@@ -44,8 +44,10 @@int nfs4_acl_add_ace (struct nfs4_acl *,u32 ,u32 ,u32 ,int ,uid_t );int nfs4_acl_get_whotype (char *,u32 );int nfs4_acl_write_who (int who,char *p); +#if 0 int nfs4_acl_permission (struct nfs4_acl *acl,uid_t owner,gid_t group,uid_t who,u32 mask); +#endif #define NFS4_ACL_TYPE_DEFAULT 0x01#define NFS4_ACL_DIR 0x02
fs/nfsd/nfs4acl.c renamed from fs/nfsd/nfs4acl.c.old +5 -4
@@ -117,8 +117,7 @@static short ace2type (struct nfs4_ace *);static int _posix_to_nfsv4_one (struct posix_acl *,struct nfs4_acl *,unsigned int );static struct posix_acl *_nfsv4_to_posix_one (struct nfs4_acl *,unsigned int ); -int nfs4_acl_add_ace (struct nfs4_acl *,u32 ,u32 ,u32 ,int ,uid_t ); -int nfs4_acl_split (struct nfs4_acl *,struct nfs4_acl *); +static int nfs4_acl_split (struct nfs4_acl *,struct nfs4_acl *);struct nfs4_acl * nfs4_acl_posix_to_nfsv4(struct posix_acl *pacl, struct posix_acl *dpacl,
@@ -768,7 +767,7 @@return pacl; } -int +static int nfs4_acl_split (struct nfs4_acl *acl,struct nfs4_acl *dacl) {struct list_head *h, *n;
@@ -940,6 +939,7 @@ } } +#if 0 /* 0 = granted, -EACCES = denied; mask is an nfsv4 mask, not mode bits */ int nfs4_acl_permission(struct nfs4_acl *acl, uid_t owner, gid_t group,
@@ -965,10 +965,11 @@ }return -EACCES ; } +EXPORT_SYMBOL (nfs4_acl_permission); +#endif /* 0 */ EXPORT_SYMBOL (nfs4_acl_new);EXPORT_SYMBOL (nfs4_acl_free);EXPORT_SYMBOL (nfs4_acl_add_ace);EXPORT_SYMBOL (nfs4_acl_get_whotype);EXPORT_SYMBOL (nfs4_acl_write_who); -EXPORT_SYMBOL (nfs4_acl_permission);
fs/nfsd/nfs4callback.c renamed from fs/nfsd/nfs4callback.c.old +3 -4
@@ -53,7 +53,6 @@/* declarations */ static void nfs4_cb_null (struct rpc_task *task); -extern spinlock_t recall_lock;/* Index of predefined Linux callback client operations */
@@ -327,12 +326,12 @@ .p_bufsiz = MAX(NFS4_##argtype##_sz,NFS4_##restype##_sz) << 2, \ } -struct rpc_procinfo nfs4_cb_procedures[] = { +static struct rpc_procinfo nfs4_cb_procedures[] = {PROC (CB_NULL ,NULL , enc_cb_null, dec_cb_null),PROC (CB_RECALL ,COMPOUND , enc_cb_recall, dec_cb_recall), }; -struct rpc_version nfs_cb_version4 = { +static struct rpc_version nfs_cb_version4 = { .number =1 , .nrprocs =sizeof (nfs4_cb_procedures)/sizeof (nfs4_cb_procedures[0 ]), .procs = nfs4_cb_procedures
@@ -346,7 +345,7 @@/* * Use the SETCLIENTID credential */ -struct rpc_cred * +static struct rpc_cred *nfsd4_lookupcred (struct nfs4_client *clp,int taskflags) {struct auth_cred acred;
fs/nfsd/nfs4idmap.c renamed from fs/nfsd/nfs4idmap.c.old +6 -6
@@ -104,7 +104,7 @@ent_init (new, itm); } -void +static void ent_put (struct cache_head *ch,struct cache_detail *cd) {if (cache_put (ch, cd)) {
@@ -186,7 +186,7 @@static int idtoname_parse (struct cache_detail *,char *,int );static struct ent *idtoname_lookup (struct ent *,int ); -struct cache_detail idtoname_cache = { +static struct cache_detail idtoname_cache = { .hash_size =ENT_HASHMAX , .hash_table = idtoname_table, .name ="nfs4.idtoname" ,
@@ -277,7 +277,7 @@return hash_str (ent->name,ENT_HASHBITS ); } -void +static void nametoid_request (struct cache_detail *cd,struct cache_head *ch,char **bpp,int *blen) {
@@ -317,9 +317,9 @@ }static struct ent *nametoid_lookup (struct ent *,int ); -int nametoid_parse (struct cache_detail *,char *,int ); +static int nametoid_parse (struct cache_detail *,char *,int ); -struct cache_detail nametoid_cache = { +static struct cache_detail nametoid_cache = { .hash_size =ENT_HASHMAX , .hash_table = nametoid_table, .name ="nfs4.nametoid" ,
@@ -330,7 +330,7 @@ .warn_no_listener = warn_no_idmapd, }; -int +static int nametoid_parse (struct cache_detail *cd,char *buf,int buflen) {struct ent ent, *res;
include/linux/nfsd/state.h renamed from include/linux/nfsd/state.h.old +0 -1
@@ -279,7 +279,6 @@ ((err) != nfserr_stale_stateid) && \ ((err) != nfserr_bad_stateid)) -extern time_t nfs4_laundromat (void );extern int nfsd4_renew (clientid_t *clid);extern int nfs4_preprocess_stateid_op (struct svc_fh *current_fh,stateid_t *stateid,int flags);
fs/nfsd/nfs4state.c renamed from fs/nfsd/nfs4state.c.old +34 -41
209 lines not on this page · raw message
fs/nfsd/nfs4xdr.c renamed from fs/nfsd/nfs4xdr.c.old +2 -2
@@ -251,7 +251,7 @@ } \ }while (0 ) -u32 *read_buf(struct nfsd4_compoundargs *argp, int nbytes) +static u32 *read_buf(struct nfsd4_compoundargs *argp, int nbytes) {/* We want more bytes than seem to be available. * Maybe we need a new page, maybe we have just run out
@@ -305,7 +305,7 @@return 0 ; } -char *savemem (struct nfsd4_compoundargs *argp,u32 *p,int nbytes) +static char *savemem (struct nfsd4_compoundargs *argp,u32 *p,int nbytes) {void *new =NULL ;if (p == argp->tmp) {
fs/nfsd/nfsfh.c renamed from fs/nfsd/nfsfh.c.old +6 -5
@@ -41,7 +41,7 @@* 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,8 +280,8 @@* 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, -__u32 *datap,int *maxsize) +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,8 +297,9 @@/* * for composing old style file handles */ -inline void _fh_update_old (struct dentry *dentry,struct svc_export *exp, -struct knfsd_fh *fh) +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); fh->ofh_generation = dentry->d_inode->i_generation;
fs/nfsd/nfssvc.c renamed from fs/nfsd/nfssvc.c.old +1 -1
@@ -60,7 +60,7 @@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
fs/nfsd/vfs.c renamed from fs/nfsd/vfs.c.old +4 -4
@@ -704,8 +704,8 @@* 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, -struct file_operations *fop) +static inline void nfsd_dosync (struct file *filp,struct dentry *dp, +struct file_operations *fop) {struct inode *inode = dp->d_inode;int (*fsync) (struct file *,struct dentry *,int );
@@ -717,7 +717,7 @@ } -void +static void nfsd_sync (struct file *filp) {struct inode *inode = filp->f_dentry->d_inode;
@@ -727,7 +727,7 @@up (&inode->i_sem); } -void +static void nfsd_sync_dir (struct dentry *dp) {nfsd_dosync (NULL , dp, dp->d_inode->i_fop);