Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

to pick up the KVM fix which is required for the NX series.

1 files changed, 8 insertions, 6 deletions

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 0f0225686aee..db48a5cf8620 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -217,7 +217,7 @@ int fuse_open_common(struct inode *inode, struct file *file, bool isdir)
 {
         struct fuse_conn *fc = get_fuse_conn(inode);
         int err;
-        bool lock_inode = (file->f_flags & O_TRUNC) &&
+        bool is_wb_truncate = (file->f_flags & O_TRUNC) &&
                           fc->atomic_o_trunc &&
                           fc->writeback_cache;
 
@@ -225,16 +225,20 @@ int fuse_open_common(struct inode *inode, struct file *file, bool isdir)
         if (err)
                 return err;
 
-        if (lock_inode)
+        if (is_wb_truncate) {
                 inode_lock(inode);
+                fuse_set_nowrite(inode);
+        }
 
         err = fuse_do_open(fc, get_node_id(inode), file, isdir);
 
         if (!err)
                 fuse_finish_open(inode, file);
 
-        if (lock_inode)
+        if (is_wb_truncate) {
+                fuse_release_nowrite(inode);
                 inode_unlock(inode);
+        }
 
         return err;
 }
@@ -1997,7 +2001,7 @@ static int fuse_writepages_fill(struct page *page,
 
         if (!data->ff) {
                 err = -EIO;
-                data->ff = fuse_write_file_get(fc, get_fuse_inode(inode));
+                data->ff = fuse_write_file_get(fc, fi);
                 if (!data->ff)
                         goto out_unlock;
         }
@@ -2042,8 +2046,6 @@ static int fuse_writepages_fill(struct page *page,
          * under writeback, so we can release the page lock.
          */
         if (data->wpa == NULL) {
-                struct fuse_inode *fi = get_fuse_inode(inode);
-
                 err = -ENOMEM;
                 wpa = fuse_writepage_args_alloc();
                 if (!wpa) {