fuse: only update necessary attributes
fuse_update_attributes() refreshes metadata for internal use. Each use needs a particular set of attributes to be refreshed, but currently that cannot be expressed and all but atime are refreshed. Add a mask argument, which lets fuse_update_get_attr() to decide based on the cache_mask and the inval_mask whether a GETATTR call is needed or not. Reported-by: Yongji Xie <xieyongji@bytedance.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Родитель
ec85537519
Коммит
c6c745b810
|
@ -1045,11 +1045,9 @@ static int fuse_update_get_attr(struct inode *inode, struct file *file,
|
|||
return err;
|
||||
}
|
||||
|
||||
int fuse_update_attributes(struct inode *inode, struct file *file)
|
||||
int fuse_update_attributes(struct inode *inode, struct file *file, u32 mask)
|
||||
{
|
||||
/* Do *not* need to get atime for internal purposes */
|
||||
return fuse_update_get_attr(inode, file, NULL,
|
||||
STATX_BASIC_STATS & ~STATX_ATIME, 0);
|
||||
return fuse_update_get_attr(inode, file, NULL, mask, 0);
|
||||
}
|
||||
|
||||
int fuse_reverse_inval_entry(struct fuse_conn *fc, u64 parent_nodeid,
|
||||
|
|
|
@ -996,7 +996,7 @@ static ssize_t fuse_cache_read_iter(struct kiocb *iocb, struct iov_iter *to)
|
|||
if (fc->auto_inval_data ||
|
||||
(iocb->ki_pos + iov_iter_count(to) > i_size_read(inode))) {
|
||||
int err;
|
||||
err = fuse_update_attributes(inode, iocb->ki_filp);
|
||||
err = fuse_update_attributes(inode, iocb->ki_filp, STATX_SIZE);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
@ -1282,7 +1282,8 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
|
|||
|
||||
if (fc->writeback_cache) {
|
||||
/* Update size (EOF optimization) and mode (SUID clearing) */
|
||||
err = fuse_update_attributes(mapping->host, file);
|
||||
err = fuse_update_attributes(mapping->host, file,
|
||||
STATX_SIZE | STATX_MODE);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
@ -2633,7 +2634,7 @@ static loff_t fuse_lseek(struct file *file, loff_t offset, int whence)
|
|||
return vfs_setpos(file, outarg.offset, inode->i_sb->s_maxbytes);
|
||||
|
||||
fallback:
|
||||
err = fuse_update_attributes(inode, file);
|
||||
err = fuse_update_attributes(inode, file, STATX_SIZE);
|
||||
if (!err)
|
||||
return generic_file_llseek(file, offset, whence);
|
||||
else
|
||||
|
@ -2653,7 +2654,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int whence)
|
|||
break;
|
||||
case SEEK_END:
|
||||
inode_lock(inode);
|
||||
retval = fuse_update_attributes(inode, file);
|
||||
retval = fuse_update_attributes(inode, file, STATX_SIZE);
|
||||
if (!retval)
|
||||
retval = generic_file_llseek(file, offset, whence);
|
||||
inode_unlock(inode);
|
||||
|
|
|
@ -1161,7 +1161,7 @@ u64 fuse_lock_owner_id(struct fuse_conn *fc, fl_owner_t id);
|
|||
void fuse_flush_time_update(struct inode *inode);
|
||||
void fuse_update_ctime(struct inode *inode);
|
||||
|
||||
int fuse_update_attributes(struct inode *inode, struct file *file);
|
||||
int fuse_update_attributes(struct inode *inode, struct file *file, u32 mask);
|
||||
|
||||
void fuse_flush_writepages(struct inode *inode);
|
||||
|
||||
|
|
|
@ -454,7 +454,7 @@ static int fuse_readdir_cached(struct file *file, struct dir_context *ctx)
|
|||
* cache; both cases require an up-to-date mtime value.
|
||||
*/
|
||||
if (!ctx->pos && fc->auto_inval_data) {
|
||||
int err = fuse_update_attributes(inode, file);
|
||||
int err = fuse_update_attributes(inode, file, STATX_MTIME);
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
|
|
Загрузка…
Ссылка в новой задаче