Skip to content

L
linux-davinci
Switch branch/tag
  1. 09 Feb, 2009 1 commit
    • J. Bruce Fields's avatar
      lockd: fix regression in lockd's handling of blocked locks · 9d9b87c1
      J. Bruce Fields authored 
      If a client requests a blocking lock, is denied, then requests it again,
then here in nlmsvc_lock() we will call vfs_lock_file() without FL_SLEEP
set, because we've already queued a block and don't need the locks code
to do it again.

But that means vfs_lock_file() will return -EAGAIN instead of
FILE_LOCK_DENIED.  So we still need to translate that -EAGAIN return
into a nlm_lck_blocked error in this case, and put ourselves back on
lockd's block list.

The bug was introduced by bde74e4b "locks: add special return
value for asynchronous locks".

Thanks to Frank van Maarseveen for the report; his original test
case was essentially

	for i in `seq 30`; do flock /nfsmount/foo sleep 10 & done
Tested-by: default avatarFrank van Maarseveen <frankvm@frankvm.com>
Reported-by: default avatarFrank van Maarseveen <frankvm@frankvm.com>
Cc: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
      9d9b87c1
  3. 04 Feb, 2009 39 commits