minor nfsd cleanups
Subsystems (2)
Three patches for 3.7, mainly just shutting up sparse.--b.
PATCH 1/3 nfsd4: nfsaclsvc_encode_voidres static
From: "J. Bruce Fields" <[email protected]>
Signed-off-by J. Bruce Fields <[email protected]>
--- fs/nfsd/nfs2acl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/nfsd/nfs2acl.c +1 -2
@@ -218,8 +218,7 @@ static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p,* There must be an encoding function for void results so svc_process * will work properly. */ -int -nfsaclsvc_encode_voidres (struct svc_rqst *rqstp,__be32 *p,void *dummy) +static int nfsaclsvc_encode_voidres (struct svc_rqst *rqstp,__be32 *p,void *dummy) {return xdr_ressize_check (rqstp, p); }
Signature · 1 line
1.7.9.5
PATCH 2/3 nfsd4: declare nfs4_recoverydir properly
In reply to J. Bruce FieldsFrom: "J. Bruce Fields" <[email protected]>
Signed-off-by J. Bruce Fields <[email protected]>
--- fs/nfsd/nfsctl.c | 2 -- fs/nfsd/nfsd.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
fs/nfsd/nfsctl.c +0 -2
@@ -1008,8 +1008,6 @@ static ssize_t write_gracetime(struct file *file, char *buf, size_t size)return nfsd4_write_time (file, buf, size, &nfsd4_grace); } -extern char *nfs4_recoverydir (void ); -static ssize_t __write_recoverydir (struct file *file,char *buf,size_t size) {char *mesg = buf;
fs/nfsd/nfsd.h +2 -0
@@ -124,6 +124,7 @@ int nfs4_state_start(void);void nfs4_state_shutdown (void );void nfs4_reset_lease (time_t leasetime);int nfs4_reset_recoverydir (char *recdir); +char *nfs4_recoverydir (void );#else static inline void nfs4_state_init (void ) { }static inline int nfsd4_init_slabs (void ) {return 0 ; }
@@ -132,6 +133,7 @@ static inline int nfs4_state_start(void) { return 0; }static inline void nfs4_state_shutdown (void ) { }static inline void nfs4_reset_lease (time_t leasetime) { }static inline int nfs4_reset_recoverydir (char *recdir) {return 0 ; } +static inline char *nfs4_recoverydir (void ) {return NULL ; }#endif /*
Signature · 1 line
1.7.9.5
PATCH 3/3 nfsd: do_nfsd_create verf argument is a u32
In reply to J. Bruce FieldsFrom: "J. Bruce Fields" <[email protected]>
The types here are actually a bit of a mess. For now cast as we do in the v4 case.
Signed-off-by J. Bruce Fields <[email protected]>
--- fs/nfsd/nfs3proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs3proc.c +1 -1
@@ -247,7 +247,7 @@ nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp,/* Now create the file and set attributes */ nfserr =do_nfsd_create (rqstp, dirfhp, argp->name, argp->len, attr, newfhp, - argp->createmode, argp->verf,NULL ,NULL ); + argp->createmode, (u32 *)argp->verf,NULL ,NULL );RETURN_STATUS (nfserr); }
Signature · 1 line
1.7.9.5
Quoted 1 line · J. Bruce Fields
Three patches for 3.7, mainly just shutting up sparse.--b.
Plus one more I forgot....--b.
commit 3a6d5cded2bcb69e259e18e23474ae0c1767fc04
Author: J. Bruce Fields <[email protected]> Date: Tue Aug 14 16:09:31 2012 -0400
nfsd4: nfsd_process_n_delegations should be static
Signed-off-by J. Bruce Fields <[email protected]>
fs/nfsd/nfs4state.c +1 -1
@@ -4578,7 +4578,7 @@ void nfsd_forget_openowners(u64 num)printk (KERN_INFO "NFSD: Forgot %d open owners" , count); } -int nfsd_process_n_delegations (u64 num,struct list_head *list) +static int nfsd_process_n_delegations (u64 num,struct list_head *list) {int i, count =0 ;struct nfs4_file *fp, *fnext;