projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
9p
/
vfs_file.c
diff --git
a/fs/9p/vfs_file.c
b/fs/9p/vfs_file.c
index 3abc447783aa83cc7c5f57a57a52b9caa9063f94..7bf835f85bc822ef1119b639be82619af066d326 100644
(file)
--- a/
fs/9p/vfs_file.c
+++ b/
fs/9p/vfs_file.c
@@
-161,7
+161,7
@@
static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)
if ((fl->fl_flags & FL_POSIX) != FL_POSIX)
BUG();
if ((fl->fl_flags & FL_POSIX) != FL_POSIX)
BUG();
- res =
posix
_lock_file_wait(filp, fl);
+ res =
locks
_lock_file_wait(filp, fl);
if (res < 0)
goto out;
if (res < 0)
goto out;
@@
-231,7
+231,8
@@
out_unlock:
if (res < 0 && fl->fl_type != F_UNLCK) {
fl_type = fl->fl_type;
fl->fl_type = F_UNLCK;
if (res < 0 && fl->fl_type != F_UNLCK) {
fl_type = fl->fl_type;
fl->fl_type = F_UNLCK;
- res = posix_lock_file_wait(filp, fl);
+ /* Even if this fails we want to return the remote error */
+ locks_lock_file_wait(filp, fl);
fl->fl_type = fl_type;
}
out:
fl->fl_type = fl_type;
}
out: