X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=fs%2F9p%2Fvfs_file.c;h=7bf835f85bc822ef1119b639be82619af066d326;hb=9cf5c095b65da63c08b928a7d0015d5d5dca8a66;hp=f23fd86697ea5ed4234ff96a8dd236b8884e6026;hpb=2c302e7e41050dbc174d50b58ad42eedf5dbd6fa;p=firefly-linux-kernel-4.4.55.git

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index f23fd86697ea..7bf835f85bc8 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -231,7 +231,8 @@ out_unlock:
 	if (res < 0 && fl->fl_type != F_UNLCK) {
 		fl_type = fl->fl_type;
 		fl->fl_type = F_UNLCK;
-		res = locks_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: