fs/nfsd/: possible cleanups
Subsystems (2)
PATCH 1/1 fs/nfsd/: possible cleanups
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global function:
- nfs4state.c: set_no_grace
Signed-off-by Adrian Bunk <[email protected]>
---
fs/nfsd/nfs4acl.c | 4 +- fs/nfsd/nfs4callback.c | 7 +-- fs/nfsd/nfs4idmap.c | 12 +++--- fs/nfsd/nfs4state.c | 65 +++++++++++++++++-------------------- fs/nfsd/nfs4xdr.c | 4 +- include/linux/nfsd/state.h | 8 ---- 6 files changed, 44 insertions(+), 56 deletions(-)
fs/nfsd/nfs4acl.c renamed from fs/nfsd/nfs4acl.c.old +2 -2
@@ -125,7 +125,7 @@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,
@@ -775,7 +775,7 @@return pacl; } -int +static int nfs4_acl_split (struct nfs4_acl *acl,struct nfs4_acl *dacl) {struct list_head *h, *n;
fs/nfsd/nfs4callback.c renamed from fs/nfsd/nfs4callback.c.old +3 -4
@@ -54,7 +54,6 @@/* declarations */ static void nfs4_cb_null (struct rpc_task *task); -extern spinlock_t recall_lock;/* Index of predefined Linux callback client operations */
@@ -329,12 +328,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
@@ -348,7 +347,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 -8
@@ -61,11 +61,6 @@#define si_stateownerid si_opaque.so_stateownerid#define si_fileid si_opaque.so_fileid -extern stateid_t zerostateid; -extern stateid_t onestateid; - -#define ZERO_STATEID (stateid) (!memcmp((stateid), &zerostateid, sizeof(stateid_t))) -#define ONE_STATEID (stateid) (!memcmp((stateid), &onestateid, sizeof(stateid_t)))struct nfs4_cb_recall {u32 cbr_ident;
@@ -268,12 +263,9 @@ ((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,struct file **filp); -extern int nfs4_share_conflict (struct svc_fh *current_fh, -unsigned int deny_type);extern void nfs4_lock_state (void );extern void nfs4_unlock_state (void );extern int nfs4_in_grace (void );
fs/nfsd/nfs4state.c renamed from fs/nfsd/nfs4state.c.old +31 -34
205 lines not on this page · raw message
fs/nfsd/nfs4xdr.c renamed from fs/nfsd/nfs4xdr.c.old +2 -2
@@ -136,7 +136,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
@@ -190,7 +190,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) {
Quoted 4 lines · Adrian Bunk
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global function:
-nfs4state.c:set_no_grace
Got it, thanks.--b.
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans! Take this survey and enter to win a one-year sub to SourceForge.net Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs