Commit 27ae449b authored by Miklos Szeredi's avatar Miklos Szeredi

fuse: rename fuse_write_update_size()

This function already updates the attr_version in fuse_inode, regardless of
whether the size was changed or not.

Rename the helper to fuse_write_update_attr() to reflect the more generic
nature.
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 8c56e03d
...@@ -736,7 +736,7 @@ static ssize_t fuse_dax_direct_write(struct kiocb *iocb, struct iov_iter *from) ...@@ -736,7 +736,7 @@ static ssize_t fuse_dax_direct_write(struct kiocb *iocb, struct iov_iter *from)
return ret; return ret;
fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE); fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);
fuse_write_update_size(inode, iocb->ki_pos); fuse_write_update_attr(inode, iocb->ki_pos);
return ret; return ret;
} }
......
...@@ -1591,7 +1591,7 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size, ...@@ -1591,7 +1591,7 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size,
end = outarg.offset + outarg.size; end = outarg.offset + outarg.size;
if (end > file_size) { if (end > file_size) {
file_size = end; file_size = end;
fuse_write_update_size(inode, file_size); fuse_write_update_attr(inode, file_size);
} }
num = outarg.size; num = outarg.size;
......
...@@ -1066,7 +1066,7 @@ static ssize_t fuse_send_write(struct fuse_io_args *ia, loff_t pos, ...@@ -1066,7 +1066,7 @@ static ssize_t fuse_send_write(struct fuse_io_args *ia, loff_t pos,
return err ?: ia->write.out.size; return err ?: ia->write.out.size;
} }
bool fuse_write_update_size(struct inode *inode, loff_t pos) bool fuse_write_update_attr(struct inode *inode, loff_t pos)
{ {
struct fuse_conn *fc = get_fuse_conn(inode); struct fuse_conn *fc = get_fuse_conn(inode);
struct fuse_inode *fi = get_fuse_inode(inode); struct fuse_inode *fi = get_fuse_inode(inode);
...@@ -1263,7 +1263,7 @@ static ssize_t fuse_perform_write(struct kiocb *iocb, ...@@ -1263,7 +1263,7 @@ static ssize_t fuse_perform_write(struct kiocb *iocb,
} while (!err && iov_iter_count(ii)); } while (!err && iov_iter_count(ii));
if (res > 0) if (res > 0)
fuse_write_update_size(inode, pos); fuse_write_update_attr(inode, pos);
clear_bit(FUSE_I_SIZE_UNSTABLE, &fi->state); clear_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);
fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE); fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);
...@@ -1558,7 +1558,7 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from) ...@@ -1558,7 +1558,7 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
} }
fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE); fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);
if (res > 0) if (res > 0)
fuse_write_update_size(inode, iocb->ki_pos); fuse_write_update_attr(inode, iocb->ki_pos);
inode_unlock(inode); inode_unlock(inode);
return res; return res;
...@@ -2901,7 +2901,7 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter) ...@@ -2901,7 +2901,7 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
if (iov_iter_rw(iter) == WRITE) { if (iov_iter_rw(iter) == WRITE) {
if (ret > 0) if (ret > 0)
fuse_write_update_size(inode, pos); fuse_write_update_attr(inode, pos);
else if (ret < 0 && offset + count > i_size) else if (ret < 0 && offset + count > i_size)
fuse_do_truncate(file); fuse_do_truncate(file);
} }
...@@ -2990,7 +2990,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, ...@@ -2990,7 +2990,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
/* we could have extended the file */ /* we could have extended the file */
if (!(mode & FALLOC_FL_KEEP_SIZE)) { if (!(mode & FALLOC_FL_KEEP_SIZE)) {
bool changed = fuse_write_update_size(inode, offset + length); bool changed = fuse_write_update_attr(inode, offset + length);
if (changed && fm->fc->writeback_cache) if (changed && fm->fc->writeback_cache)
file_update_time(file); file_update_time(file);
...@@ -3108,7 +3108,7 @@ static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in, ...@@ -3108,7 +3108,7 @@ static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in,
ALIGN(pos_out + outarg.size, PAGE_SIZE) - 1); ALIGN(pos_out + outarg.size, PAGE_SIZE) - 1);
if (fc->writeback_cache) { if (fc->writeback_cache) {
fuse_write_update_size(inode_out, pos_out + outarg.size); fuse_write_update_attr(inode_out, pos_out + outarg.size);
file_update_time(file_out); file_update_time(file_out);
} }
......
...@@ -1217,7 +1217,7 @@ long fuse_ioctl_common(struct file *file, unsigned int cmd, ...@@ -1217,7 +1217,7 @@ long fuse_ioctl_common(struct file *file, unsigned int cmd,
__poll_t fuse_file_poll(struct file *file, poll_table *wait); __poll_t fuse_file_poll(struct file *file, poll_table *wait);
int fuse_dev_release(struct inode *inode, struct file *file); int fuse_dev_release(struct inode *inode, struct file *file);
bool fuse_write_update_size(struct inode *inode, loff_t pos); bool fuse_write_update_attr(struct inode *inode, loff_t pos);
int fuse_flush_times(struct inode *inode, struct fuse_file *ff); int fuse_flush_times(struct inode *inode, struct fuse_file *ff);
int fuse_write_inode(struct inode *inode, struct writeback_control *wbc); int fuse_write_inode(struct inode *inode, struct writeback_control *wbc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment