summaryrefslogtreecommitdiffstats
path: root/security/keys
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-02-04 17:35:38 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-02-09 13:19:46 -0500
commit9d9b87c1218be78ddecbc85ec3bb91c79c1d56ab (patch)
treee33e637f4fa8b4dd1946c6a29e290078d34a388c /security/keys
parenteda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff)
lockd: fix regression in lockd's handling of blocked locks
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 bde74e4bc64415b1 "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: Frank van Maarseveen <frankvm@frankvm.com> Reported-by: Frank van Maarseveen <frankvm@frankvm.com> Cc: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'security/keys')
0 files changed, 0 insertions, 0 deletions