* minor nfsd cleanups
@ 2012-08-20 22:50 J. Bruce Fields
2012-08-20 22:50 ` [PATCH 1/3] nfsd4: nfsaclsvc_encode_voidres static J. Bruce Fields
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: J. Bruce Fields @ 2012-08-20 22:50 UTC (permalink / raw)
To: linux-nfs
Three patches for 3.7, mainly just shutting up sparse.--b.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] nfsd4: nfsaclsvc_encode_voidres static
2012-08-20 22:50 minor nfsd cleanups J. Bruce Fields
@ 2012-08-20 22:50 ` J. Bruce Fields
2012-08-20 22:50 ` [PATCH 2/3] nfsd4: declare nfs4_recoverydir properly J. Bruce Fields
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: J. Bruce Fields @ 2012-08-20 22:50 UTC (permalink / raw)
To: linux-nfs; +Cc: J. Bruce Fields
From: "J. Bruce Fields" <bfields@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
fs/nfsd/nfs2acl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index 6aa5590..b314888 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -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);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] nfsd4: declare nfs4_recoverydir properly
2012-08-20 22:50 minor nfsd cleanups J. Bruce Fields
2012-08-20 22:50 ` [PATCH 1/3] nfsd4: nfsaclsvc_encode_voidres static J. Bruce Fields
@ 2012-08-20 22:50 ` J. Bruce Fields
2012-08-20 22:51 ` [PATCH 3/3] nfsd: do_nfsd_create verf argument is a u32 J. Bruce Fields
2012-08-20 22:56 ` minor nfsd cleanups J. Bruce Fields
3 siblings, 0 replies; 5+ messages in thread
From: J. Bruce Fields @ 2012-08-20 22:50 UTC (permalink / raw)
To: linux-nfs; +Cc: J. Bruce Fields
From: "J. Bruce Fields" <bfields@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
fs/nfsd/nfsctl.c | 2 --
fs/nfsd/nfsd.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index fa49cff..009632a 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -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;
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 2244222..36243a3 100644
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -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
/*
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] nfsd: do_nfsd_create verf argument is a u32
2012-08-20 22:50 minor nfsd cleanups J. Bruce Fields
2012-08-20 22:50 ` [PATCH 1/3] nfsd4: nfsaclsvc_encode_voidres static J. Bruce Fields
2012-08-20 22:50 ` [PATCH 2/3] nfsd4: declare nfs4_recoverydir properly J. Bruce Fields
@ 2012-08-20 22:51 ` J. Bruce Fields
2012-08-20 22:56 ` minor nfsd cleanups J. Bruce Fields
3 siblings, 0 replies; 5+ messages in thread
From: J. Bruce Fields @ 2012-08-20 22:51 UTC (permalink / raw)
To: linux-nfs; +Cc: J. Bruce Fields
From: "J. Bruce Fields" <bfields@redhat.com>
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 <bfields@redhat.com>
---
fs/nfsd/nfs3proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 9095f3c..97d90d1 100644
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -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);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: minor nfsd cleanups
2012-08-20 22:50 minor nfsd cleanups J. Bruce Fields
` (2 preceding siblings ...)
2012-08-20 22:51 ` [PATCH 3/3] nfsd: do_nfsd_create verf argument is a u32 J. Bruce Fields
@ 2012-08-20 22:56 ` J. Bruce Fields
3 siblings, 0 replies; 5+ messages in thread
From: J. Bruce Fields @ 2012-08-20 22:56 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: linux-nfs
On Mon, Aug 20, 2012 at 06:50:57PM -0400, J. Bruce Fields wrote:
> Three patches for 3.7, mainly just shutting up sparse.--b.
Plus one more I forgot....--b.
commit 3a6d5cded2bcb69e259e18e23474ae0c1767fc04
Author: J. Bruce Fields <bfields@redhat.com>
Date: Tue Aug 14 16:09:31 2012 -0400
nfsd4: nfsd_process_n_delegations should be static
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 566a9b7..f393da8 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -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;
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-08-20 22:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-20 22:50 minor nfsd cleanups J. Bruce Fields
2012-08-20 22:50 ` [PATCH 1/3] nfsd4: nfsaclsvc_encode_voidres static J. Bruce Fields
2012-08-20 22:50 ` [PATCH 2/3] nfsd4: declare nfs4_recoverydir properly J. Bruce Fields
2012-08-20 22:51 ` [PATCH 3/3] nfsd: do_nfsd_create verf argument is a u32 J. Bruce Fields
2012-08-20 22:56 ` minor nfsd cleanups J. Bruce Fields
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.