redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

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>
wifi-calibration
Jim Garlick 2012-01-03 15:27:50 -06:00 committed by Eric Van Hensbergen
parent 805a6af8db
commit a0ea787b02
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/9p/vfs_file.c
View File

@ -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 */