diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 19:39:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 19:39:22 -0400 |
| commit | b0e0c9e7f6d5764633e93944dafd896dd6097318 (patch) | |
| tree | 668d9adb29cb566f6240e7bc51faaf564d3241ca /fs/lockd/svcproc.c | |
| parent | dae816835e8d1276c9e50d9c4dba75b7705fe66c (diff) | |
| parent | 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca (diff) | |
Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux:
fs/nfsd/export.c: Adjust error handling code involving auth_domain_put
MAINTAINERS: mention lockd and sunrpc in nfs entries
lockd: trivial sparse endian annotations
Diffstat (limited to 'fs/lockd/svcproc.c')
| -rw-r--r-- | fs/lockd/svcproc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index 76019d2ff72d..76262c1986f2 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, | |||
| 112 | { | 112 | { |
| 113 | struct nlm_host *host; | 113 | struct nlm_host *host; |
| 114 | struct nlm_file *file; | 114 | struct nlm_file *file; |
| 115 | int rc = rpc_success; | 115 | __be32 rc = rpc_success; |
| 116 | 116 | ||
| 117 | dprintk("lockd: TEST called\n"); | 117 | dprintk("lockd: TEST called\n"); |
| 118 | resp->cookie = argp->cookie; | 118 | resp->cookie = argp->cookie; |
| @@ -146,7 +146,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 146 | { | 146 | { |
| 147 | struct nlm_host *host; | 147 | struct nlm_host *host; |
| 148 | struct nlm_file *file; | 148 | struct nlm_file *file; |
| 149 | int rc = rpc_success; | 149 | __be32 rc = rpc_success; |
| 150 | 150 | ||
| 151 | dprintk("lockd: LOCK called\n"); | 151 | dprintk("lockd: LOCK called\n"); |
| 152 | 152 | ||