tree 32b7b1a4af4b28c3ce1fc013bc7a2da4f2e21fde
parent b533184fc353d4a2d07929b4ac424a6f1bf5a3b9
author Matthew Wilcox <matthew@wil.cx> 1200371310 -0700
committer J. Bruce Fields <bfields@citi.umich.edu> 1202079096 -0500

file locks: Use wait_event_interruptible_timeout()

interruptible_sleep_on_locked() is just an open-coded
wait_event_interruptible_timeout(), with the one difference that
interruptible_sleep_on_locked() doesn't bother to check the condition on
which it is waiting, depending instead on the BKL to avoid the case
where it blocks after the wakeup has already been called.

locks_block_on_timeout() is only used in one place, so it's actually
simpler to inline it into its caller.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>