diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/lockd/svclock.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 51a0dea0ae8a..b8f86b73a85d 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c | |||
@@ -180,6 +180,7 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_host *host, | |||
180 | struct nlm_block *block; | 180 | struct nlm_block *block; |
181 | struct nlm_rqst *call = NULL; | 181 | struct nlm_rqst *call = NULL; |
182 | 182 | ||
183 | nlm_get_host(host); | ||
183 | call = nlm_alloc_call(host); | 184 | call = nlm_alloc_call(host); |
184 | if (call == NULL) | 185 | if (call == NULL) |
185 | return NULL; | 186 | return NULL; |
@@ -380,8 +381,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, | |||
380 | */ | 381 | */ |
381 | block = nlmsvc_lookup_block(file, lock); | 382 | block = nlmsvc_lookup_block(file, lock); |
382 | if (block == NULL) { | 383 | if (block == NULL) { |
383 | block = nlmsvc_create_block(rqstp, nlm_get_host(host), file, | 384 | block = nlmsvc_create_block(rqstp, host, file, lock, cookie); |
384 | lock, cookie); | ||
385 | ret = nlm_lck_denied_nolocks; | 385 | ret = nlm_lck_denied_nolocks; |
386 | if (block == NULL) | 386 | if (block == NULL) |
387 | goto out; | 387 | goto out; |
@@ -476,7 +476,6 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, | |||
476 | 476 | ||
477 | if (conf == NULL) | 477 | if (conf == NULL) |
478 | return nlm_granted; | 478 | return nlm_granted; |
479 | nlm_get_host(host); | ||
480 | block = nlmsvc_create_block(rqstp, host, file, lock, cookie); | 479 | block = nlmsvc_create_block(rqstp, host, file, lock, cookie); |
481 | if (block == NULL) { | 480 | if (block == NULL) { |
482 | kfree(conf); | 481 | kfree(conf); |