Commit a0ea787b authored Jan 03, 2012 by Jim Garlick Committed by Eric Van Hensbergen Jan 05, 2012

fs/9p: check schedule_timeout_interruptible return value



In v9fs_file_do_lock() we need to check return value of
schedule_timeout_interruptible() and exit the loop when it
returns nonzero, otherwise the loop is not really interruptible
and after the signal, the loop is no longer throttled by
P9_LOCK_TIMEOUT.

Signed-off-by: Jim Garlick <garlick.jim@gmail.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

parent 805a6af8

fs/9p/vfs_file.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,8 @@ static int v9fs_file_do_lock(struct file filp, int cmd, struct file_lock fl)
		break;
		if (status == P9_LOCK_BLOCKED && !IS_SETLKW(cmd))
		break;
		schedule_timeout_interruptible(P9_LOCK_TIMEOUT);
		if (schedule_timeout_interruptible(P9_LOCK_TIMEOUT) != 0)
		break;
		}

		/* map 9p status to VFS status */

Admin message