2008-07-18 00:41:47

by Harvey Harrison

[permalink] [raw]
Subject: [PATCH] lockd: trivial sparse endian annotations

fs/lockd/svcproc.c:115:11: warning: incorrect type in initializer (different base types)
fs/lockd/svcproc.c:115:11: expected int [signed] rc
fs/lockd/svcproc.c:115:11: got restricted __be32 [usertype] <noident>
... and so on...

Signed-off-by: Harvey Harrison <[email protected]>
---
fs/lockd/svc4proc.c | 4 ++--
fs/lockd/svcproc.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index 3994446..4a714f6 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -83,7 +83,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
{
struct nlm_host *host;
struct nlm_file *file;
- int rc = rpc_success;
+ __be32 rc = rpc_success;

dprintk("lockd: TEST4 called\n");
resp->cookie = argp->cookie;
@@ -116,7 +116,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
{
struct nlm_host *host;
struct nlm_file *file;
- int rc = rpc_success;
+ __be32 rc = rpc_success;

dprintk("lockd: LOCK called\n");

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 76019d2..76262c1 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -112,7 +112,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
{
struct nlm_host *host;
struct nlm_file *file;
- int rc = rpc_success;
+ __be32 rc = rpc_success;

dprintk("lockd: TEST called\n");
resp->cookie = argp->cookie;
@@ -146,7 +146,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
{
struct nlm_host *host;
struct nlm_file *file;
- int rc = rpc_success;
+ __be32 rc = rpc_success;

dprintk("lockd: LOCK called\n");

--
1.5.6.3.569.ga9185



2008-07-21 06:42:37

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH] lockd: trivial sparse endian annotations

On Thu, 17 Jul 2008 17:41:35 -0700 Harvey Harrison <[email protected]> wrote:

> fs/lockd/svcproc.c:115:11: warning: incorrect type in initializer (different base types)
> fs/lockd/svcproc.c:115:11: expected int [signed] rc
> fs/lockd/svcproc.c:115:11: got restricted __be32 [usertype] <noident>
> ... and so on...

Bruce handles lockd stuff. Not that a reader of ./MAINTAINERS would
know this </hint>.

2008-07-23 15:45:58

by J. Bruce Fields

[permalink] [raw]
Subject: Re: [PATCH] lockd: trivial sparse endian annotations

On Sun, Jul 20, 2008 at 11:42:11PM -0700, Andrew Morton wrote:
> On Thu, 17 Jul 2008 17:41:35 -0700 Harvey Harrison <[email protected]> wrote:
>
> > fs/lockd/svcproc.c:115:11: warning: incorrect type in initializer (different base types)
> > fs/lockd/svcproc.c:115:11: expected int [signed] rc
> > fs/lockd/svcproc.c:115:11: got restricted __be32 [usertype] <noident>
> > ... and so on...
>
> Bruce handles lockd stuff.

Actually Trond normally handles client-specific lockd code (e.g.
fs/lockd/clnt*.c), though of course I'm happy to triage stuff and pass
it along.

> Not that a reader of ./MAINTAINERS would know this </hint>.

Would this help?

--b.

commit e8b43555a2a8c71e8501924e260f62b9545c598b
Author: J. Bruce Fields <[email protected]>
Date: Wed Jul 23 08:49:50 2008 -0400

MAINTAINERS: mention lockd and sunrpc in nfs entries

The actual division of labor is a little vague in some of the common
code, but if the patches get to one of us then we can sort it out.

Signed-off-by: J. Bruce Fields <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
index 0652ab3..c382ad3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2418,7 +2418,7 @@ L: [email protected]
W: http://www.kerneljanitors.org/
S: Maintained

-KERNEL NFSD
+KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
P: J. Bruce Fields
M: [email protected]
P: Neil Brown
@@ -3036,7 +3036,7 @@ M: [email protected]
L: [email protected]
S: Maintained

-NFS CLIENT
+NFS, SUNRPC, AND LOCKD CLIENTS
P: Trond Myklebust
M: [email protected]
L: [email protected]