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 <[email protected]> Signed-off-by: Eric Van Hensbergen <[email protected]>
franciscofranco · Jan 5, 2012 · a0ea787 · a0ea787
1 parent 805a6af
commit a0ea787
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
@@ -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 */