UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

fuse: move fuse_invalidate_attr() into fuse_update_ctime() 

Logically it belongs there since attributes are invalidated due to the
updated ctime.  This is a cleanup and should not change behavior.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Miklos Szeredi 2021-10-22 17:03:01 +02:00
parent b5d9758297
commit 371e8fd029
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/fuse/dir.c
View File

@ -747,6 +747,7 @@ void fuse_flush_time_update(struct inode *inode)
void fuse_update_ctime(struct inode *inode) void fuse_update_ctime(struct inode *inode)
{ {
fuse_invalidate_attr(inode);
if (!IS_NOCMTIME(inode)) { if (!IS_NOCMTIME(inode)) {
inode->i_ctime = current_time(inode); inode->i_ctime = current_time(inode);
mark_inode_dirty_sync(inode); mark_inode_dirty_sync(inode);
@ -784,7 +785,6 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
if (inode->i_nlink > 0) if (inode->i_nlink > 0)
drop_nlink(inode); drop_nlink(inode);
spin_unlock(&fi->lock); spin_unlock(&fi->lock);
fuse_invalidate_attr(inode);
fuse_dir_changed(dir); fuse_dir_changed(dir);
fuse_invalidate_entry_cache(entry); fuse_invalidate_entry_cache(entry);
fuse_update_ctime(inode); fuse_update_ctime(inode);
@ -841,13 +841,10 @@ static int fuse_rename_common(struct inode *olddir, struct dentry *oldent,
err = fuse_simple_request(fm, &args); err = fuse_simple_request(fm, &args);
if (!err) { if (!err) {
/* ctime changes */ /* ctime changes */
fuse_invalidate_attr(d_inode(oldent));
fuse_update_ctime(d_inode(oldent)); fuse_update_ctime(d_inode(oldent));
if (flags & RENAME_EXCHANGE) { if (flags & RENAME_EXCHANGE)
fuse_invalidate_attr(d_inode(newent));
fuse_update_ctime(d_inode(newent)); fuse_update_ctime(d_inode(newent));
}
fuse_dir_changed(olddir); fuse_dir_changed(olddir);
if (olddir != newdir) if (olddir != newdir)
@ -855,7 +852,6 @@ static int fuse_rename_common(struct inode *olddir, struct dentry *oldent,
/* newent will end up negative */ /* newent will end up negative */
if (!(flags & RENAME_EXCHANGE) && d_really_is_positive(newent)) { if (!(flags & RENAME_EXCHANGE) && d_really_is_positive(newent)) {
fuse_invalidate_attr(d_inode(newent));
fuse_invalidate_entry_cache(newent); fuse_invalidate_entry_cache(newent);
fuse_update_ctime(d_inode(newent)); fuse_update_ctime(d_inode(newent));
} }
@ -938,7 +934,6 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,
if (likely(inode->i_nlink < UINT_MAX)) if (likely(inode->i_nlink < UINT_MAX))
inc_nlink(inode); inc_nlink(inode);
spin_unlock(&fi->lock); spin_unlock(&fi->lock);
fuse_invalidate_attr(inode);
fuse_update_ctime(inode); fuse_update_ctime(inode);
} else if (err == -EINTR) { } else if (err == -EINTR) {
fuse_invalidate_attr(inode); fuse_invalidate_attr(inode);

10
fs/fuse/xattr.c
View File

@ -42,10 +42,9 @@ int fuse_setxattr(struct inode *inode, const char *name, const void *value,
fm->fc->no_setxattr = 1; fm->fc->no_setxattr = 1;
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
} }
if (!err) { if (!err)
fuse_invalidate_attr(inode);
fuse_update_ctime(inode); fuse_update_ctime(inode);
}
return err; return err;
} }
@ -173,10 +172,9 @@ int fuse_removexattr(struct inode *inode, const char *name)
fm->fc->no_removexattr = 1; fm->fc->no_removexattr = 1;
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
} }
if (!err) { if (!err)
fuse_invalidate_attr(inode);
fuse_update_ctime(inode); fuse_update_ctime(inode);
}
return err; return err;
} }