fuse: factor out helper fuse_truncate_update_attr()

fuse_finish_open() is called from fuse_open_common() and from
fuse_create_open().  In the latter case, the O_TRUNC flag is always
cleared in finish_open()m before calling into fuse_finish_open().

Move the bits that update attribute cache post O_TRUNC open into a
helper and call this helper from fuse_open_common() directly.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 0115428c33a2572fb8aea56a3b397d9e246ef24c..1b403350a5d5b03dcabbd9d21e90c64e93d084a6 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -205,30 +205,31 @@ void fuse_finish_open(struct inode *inode, struct file *file)
        else if (ff->open_flags & FOPEN_NONSEEKABLE)
                nonseekable_open(inode, file);
 
-       if (fc->atomic_o_trunc && (file->f_flags & O_TRUNC)) {
-               struct fuse_inode *fi = get_fuse_inode(inode);
-
-               spin_lock(&fi->lock);
-               fi->attr_version = atomic64_inc_return(&fc->attr_version);
-               i_size_write(inode, 0);
-               spin_unlock(&fi->lock);
-               file_update_time(file);
-               fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);
-       }
        if ((file->f_mode & FMODE_WRITE) && fc->writeback_cache)
                fuse_link_write_file(file);
 }
 
+static void fuse_truncate_update_attr(struct inode *inode, struct file *file)
+{
+       struct fuse_conn *fc = get_fuse_conn(inode);
+       struct fuse_inode *fi = get_fuse_inode(inode);
+
+       spin_lock(&fi->lock);
+       fi->attr_version = atomic64_inc_return(&fc->attr_version);
+       i_size_write(inode, 0);
+       spin_unlock(&fi->lock);
+       file_update_time(file);
+       fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);
+}
+
 int fuse_open_common(struct inode *inode, struct file *file, bool isdir)
 {
        struct fuse_mount *fm = get_fuse_mount(inode);
        struct fuse_conn *fc = fm->fc;
        int err;
-       bool is_wb_truncate = (file->f_flags & O_TRUNC) &&
-                         fc->atomic_o_trunc &&
-                         fc->writeback_cache;
-       bool dax_truncate = (file->f_flags & O_TRUNC) &&
-                         fc->atomic_o_trunc && FUSE_IS_DAX(inode);
+       bool is_truncate = (file->f_flags & O_TRUNC) && fc->atomic_o_trunc;
+       bool is_wb_truncate = is_truncate && fc->writeback_cache;
+       bool dax_truncate = is_truncate && FUSE_IS_DAX(inode);
 
        if (fuse_is_bad(inode))
                return -EIO;
@@ -251,15 +252,18 @@ int fuse_open_common(struct inode *inode, struct file *file, bool isdir)
                fuse_set_nowrite(inode);
 
        err = fuse_do_open(fm, get_node_id(inode), file, isdir);
-       if (!err)
+       if (!err) {
                fuse_finish_open(inode, file);
+               if (is_truncate)
+                       fuse_truncate_update_attr(inode, file);
+       }
 
        if (is_wb_truncate || dax_truncate)
                fuse_release_nowrite(inode);
        if (!err) {
                struct fuse_file *ff = file->private_data;
 
-               if (fc->atomic_o_trunc && (file->f_flags & O_TRUNC))
+               if (is_truncate)
                        truncate_pagecache(inode, 0);
                else if (!(ff->open_flags & FOPEN_KEEP_CACHE))
                        invalidate_inode_pages2(inode->i_mapping);