diff options
Diffstat (limited to 'fs/lockd/svc4proc.c')
-rw-r--r-- | fs/lockd/svc4proc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index 2e27176ff42f..399444639337 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c | |||
@@ -58,8 +58,7 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
58 | return 0; | 58 | return 0; |
59 | 59 | ||
60 | no_locks: | 60 | no_locks: |
61 | if (host) | 61 | nlm_release_host(host); |
62 | nlm_release_host(host); | ||
63 | if (error) | 62 | if (error) |
64 | return error; | 63 | return error; |
65 | return nlm_lck_denied_nolocks; | 64 | return nlm_lck_denied_nolocks; |
@@ -100,7 +99,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
100 | return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success; | 99 | return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success; |
101 | 100 | ||
102 | /* Now check for conflicting locks */ | 101 | /* Now check for conflicting locks */ |
103 | resp->status = nlmsvc_testlock(rqstp, file, &argp->lock, &resp->lock, &resp->cookie); | 102 | resp->status = nlmsvc_testlock(rqstp, file, host, &argp->lock, &resp->lock, &resp->cookie); |
104 | if (resp->status == nlm_drop_reply) | 103 | if (resp->status == nlm_drop_reply) |
105 | rc = rpc_drop_reply; | 104 | rc = rpc_drop_reply; |
106 | else | 105 | else |
@@ -146,7 +145,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
146 | #endif | 145 | #endif |
147 | 146 | ||
148 | /* Now try to lock the file */ | 147 | /* Now try to lock the file */ |
149 | resp->status = nlmsvc_lock(rqstp, file, &argp->lock, | 148 | resp->status = nlmsvc_lock(rqstp, file, host, &argp->lock, |
150 | argp->block, &argp->cookie); | 149 | argp->block, &argp->cookie); |
151 | if (resp->status == nlm_drop_reply) | 150 | if (resp->status == nlm_drop_reply) |
152 | rc = rpc_drop_reply; | 151 | rc = rpc_drop_reply; |