diff options
Diffstat (limited to 'fs/lockd/svclock.c')
| -rw-r--r-- | fs/lockd/svclock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 97b0160ef10f..3b0e7a4b817b 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c | |||
| @@ -363,7 +363,7 @@ again: | |||
| 363 | } else | 363 | } else |
| 364 | lock = &block->b_call->a_args.lock; | 364 | lock = &block->b_call->a_args.lock; |
| 365 | 365 | ||
| 366 | error = posix_lock_file(file->f_file, &lock->fl); | 366 | error = posix_lock_file(file->f_file, &lock->fl, NULL); |
| 367 | lock->fl.fl_flags &= ~FL_SLEEP; | 367 | lock->fl.fl_flags &= ~FL_SLEEP; |
| 368 | 368 | ||
| 369 | dprintk("lockd: posix_lock_file returned %d\n", error); | 369 | dprintk("lockd: posix_lock_file returned %d\n", error); |
| @@ -467,7 +467,7 @@ nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock) | |||
| 467 | nlmsvc_cancel_blocked(file, lock); | 467 | nlmsvc_cancel_blocked(file, lock); |
| 468 | 468 | ||
| 469 | lock->fl.fl_type = F_UNLCK; | 469 | lock->fl.fl_type = F_UNLCK; |
| 470 | error = posix_lock_file(file->f_file, &lock->fl); | 470 | error = posix_lock_file(file->f_file, &lock->fl, NULL); |
| 471 | 471 | ||
| 472 | return (error < 0)? nlm_lck_denied_nolocks : nlm_granted; | 472 | return (error < 0)? nlm_lck_denied_nolocks : nlm_granted; |
| 473 | } | 473 | } |
| @@ -569,7 +569,7 @@ nlmsvc_grant_blocked(struct nlm_block *block) | |||
| 569 | 569 | ||
| 570 | /* Try the lock operation again */ | 570 | /* Try the lock operation again */ |
| 571 | lock->fl.fl_flags |= FL_SLEEP; | 571 | lock->fl.fl_flags |= FL_SLEEP; |
| 572 | error = posix_lock_file(file->f_file, &lock->fl); | 572 | error = posix_lock_file(file->f_file, &lock->fl, NULL); |
| 573 | lock->fl.fl_flags &= ~FL_SLEEP; | 573 | lock->fl.fl_flags &= ~FL_SLEEP; |
| 574 | 574 | ||
| 575 | switch (error) { | 575 | switch (error) { |
