fuse: move attr_version to a more relevant place
Subsystems (2)
PATCH 1/1 fuse: move attr_version to a more relevant place
Move attr_version assignment code to the more relevant place.
Signed-off-by zhangliguang <[email protected]>
--- fs/fuse/dir.c | 10 ++++------ fs/fuse/readdir.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-)
fs/fuse/dir.c +4 -6
@@ -191,8 +191,6 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)if (!forget) goto out; - attr_version =fuse_get_attr_version (fc); - parent =dget_parent (entry);fuse_lookup_init (fc, &args,get_node_id (d_inode (parent)), &entry->d_name, &outarg);
@@ -218,6 +216,8 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) goto invalid;forget_all_cached_acls (inode); + + attr_version =fuse_get_attr_version (fc);fuse_change_attributes (inode, &outarg.attr,entry_attr_timeout (&outarg), attr_version);
@@ -292,8 +292,6 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *nameif (!forget) goto out; - attr_version =fuse_get_attr_version (fc); -fuse_lookup_init (fc, &args, nodeid, name, outarg); err =fuse_simple_request (fc, &args);/* Zero nodeid is same as -ENOENT, but with valid timeout */
@@ -306,6 +304,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *nameif (!fuse_valid_type (outarg->attr.mode)) goto out_put_forget; + attr_version =fuse_get_attr_version (fc); *inode =fuse_iget (sb, outarg->nodeid, outarg->generation, &outarg->attr,entry_attr_timeout (outarg), attr_version);
@@ -873,8 +872,6 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,FUSE_ARGS (args);u64 attr_version; - attr_version =fuse_get_attr_version (fc); -memset (&inarg,0 ,sizeof (inarg));memset (&outarg,0 ,sizeof (outarg));/* Directories have separate file-handle space */
@@ -898,6 +895,7 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,make_bad_inode (inode); err = -EIO ; }else { + attr_version =fuse_get_attr_version (fc);fuse_change_attributes (inode, &outarg.attr,attr_timeout (&outarg), attr_version);
fs/fuse/readdir.c +1 -1
@@ -320,7 +320,6 @@ static int fuse_readdir_uncached(struct file *file, struct dir_context *ctx) req->pages[0 ] = page; req->page_descs[0 ].length =PAGE_SIZE ;if (plus) { - attr_version =fuse_get_attr_version (fc);fuse_read_fill (req, file, ctx->pos,PAGE_SIZE ,FUSE_READDIRPLUS ); }else {
@@ -340,6 +339,7 @@ static int fuse_readdir_uncached(struct file *file, struct dir_context *ctx)if (ff->open_flags &FOPEN_CACHE_DIR )fuse_readdir_cache_end (file, ctx->pos); }else if (plus) { + attr_version =fuse_get_attr_version (fc); err =parse_dirplusfile (page_address (page), nbytes, file, ctx, attr_version); }else {
Signature · 1 line
1.8.3.1