locks: allow __break_lease to sleep even when break_time is 0
authorJeff Layton <jlayton@redhat.com>
Tue, 15 Apr 2014 12:44:12 +0000 (08:44 -0400)
committerJiri Slaby <jslaby@suse.cz>
Thu, 15 May 2014 07:56:06 +0000 (09:56 +0200)
commit362fbee83ae5f1e5ca8c3797ff24dc05a4d0e6d3
treef69b4b9c8966dac9bf1bb875fe5f0eea18da67f2
parent271c57edfaa6b564032024711fdbc6608ea83129
locks: allow __break_lease to sleep even when break_time is 0

commit 4991a628a789dc5954e98e79476d9808812292ec upstream.

A fl->fl_break_time of 0 has a special meaning to the lease break code
that basically means "never break the lease". knfsd uses this to ensure
that leases don't disappear out from under it.

Unfortunately, the code in __break_lease can end up passing this value
to wait_event_interruptible as a timeout, which prevents it from going
to sleep at all. This causes __break_lease to spin in a tight loop and
causes soft lockups.

Fix this by ensuring that we pass a minimum value of 1 as a timeout
instead.

Cc: J. Bruce Fields <bfields@fieldses.org>
Reported-by: Terry Barnaby <terry1@beam.ltd.uk>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
fs/locks.c