diff options
Diffstat (limited to 'fs/lockd/svclock.c')
-rw-r--r-- | fs/lockd/svclock.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index f40afb3a0e69..bcf73f6e8226 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c | |||
@@ -358,10 +358,10 @@ nlmsvc_defer_lock_rqst(struct svc_rqst *rqstp, struct nlm_block *block) | |||
358 | */ | 358 | */ |
359 | __be32 | 359 | __be32 |
360 | nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, | 360 | nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, |
361 | struct nlm_lock *lock, int wait, struct nlm_cookie *cookie) | 361 | struct nlm_host *host, struct nlm_lock *lock, int wait, |
362 | struct nlm_cookie *cookie) | ||
362 | { | 363 | { |
363 | struct nlm_block *block = NULL; | 364 | struct nlm_block *block = NULL; |
364 | struct nlm_host *host; | ||
365 | int error; | 365 | int error; |
366 | __be32 ret; | 366 | __be32 ret; |
367 | 367 | ||
@@ -373,11 +373,6 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, | |||
373 | (long long)lock->fl.fl_end, | 373 | (long long)lock->fl.fl_end, |
374 | wait); | 374 | wait); |
375 | 375 | ||
376 | /* Create host handle for callback */ | ||
377 | host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len); | ||
378 | if (host == NULL) | ||
379 | return nlm_lck_denied_nolocks; | ||
380 | |||
381 | /* Lock file against concurrent access */ | 376 | /* Lock file against concurrent access */ |
382 | mutex_lock(&file->f_mutex); | 377 | mutex_lock(&file->f_mutex); |
383 | /* Get existing block (in case client is busy-waiting) | 378 | /* Get existing block (in case client is busy-waiting) |
@@ -450,7 +445,6 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, | |||
450 | out: | 445 | out: |
451 | mutex_unlock(&file->f_mutex); | 446 | mutex_unlock(&file->f_mutex); |
452 | nlmsvc_release_block(block); | 447 | nlmsvc_release_block(block); |
453 | nlm_release_host(host); | ||
454 | dprintk("lockd: nlmsvc_lock returned %u\n", ret); | 448 | dprintk("lockd: nlmsvc_lock returned %u\n", ret); |
455 | return ret; | 449 | return ret; |
456 | } | 450 | } |