diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 06:32:13 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 06:32:13 -0400 |
| commit | 9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee (patch) | |
| tree | 651f7058bbaa2d8b2855286380d614afcf505118 /fs/lockd | |
| parent | 31db6e9ea1dbdcf66b8227b4f7035dee1b1dd8c0 (diff) | |
| parent | bef69ea0dcce574a425feb0a5aa4c63dd108b9a6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/svc4proc.c | 4 | ||||
| -rw-r--r-- | 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 399444639337..4a714f64515b 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, | |||
| 83 | { | 83 | { |
| 84 | struct nlm_host *host; | 84 | struct nlm_host *host; |
| 85 | struct nlm_file *file; | 85 | struct nlm_file *file; |
| 86 | int rc = rpc_success; | 86 | __be32 rc = rpc_success; |
| 87 | 87 | ||
| 88 | dprintk("lockd: TEST4 called\n"); | 88 | dprintk("lockd: TEST4 called\n"); |
| 89 | resp->cookie = argp->cookie; | 89 | resp->cookie = argp->cookie; |
| @@ -116,7 +116,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 116 | { | 116 | { |
| 117 | struct nlm_host *host; | 117 | struct nlm_host *host; |
| 118 | struct nlm_file *file; | 118 | struct nlm_file *file; |
| 119 | int rc = rpc_success; | 119 | __be32 rc = rpc_success; |
| 120 | 120 | ||
| 121 | dprintk("lockd: LOCK called\n"); | 121 | dprintk("lockd: LOCK called\n"); |
| 122 | 122 | ||
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 | ||