Skip to content

Commit 27ae449

Browse files
author
Miklos Szeredi
committed
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: Miklos Szeredi <[email protected]>
1 parent 8c56e03 commit 27ae449

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

fs/fuse/dax.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ static ssize_t fuse_dax_direct_write(struct kiocb *iocb, struct iov_iter *from)
736736
return ret;
737737

738738
fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);
739-
fuse_write_update_size(inode, iocb->ki_pos);
739+
fuse_write_update_attr(inode, iocb->ki_pos);
740740
return ret;
741741
}
742742

fs/fuse/dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1591,7 +1591,7 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size,
15911591
end = outarg.offset + outarg.size;
15921592
if (end > file_size) {
15931593
file_size = end;
1594-
fuse_write_update_size(inode, file_size);
1594+
fuse_write_update_attr(inode, file_size);
15951595
}
15961596

15971597
num = outarg.size;

fs/fuse/file.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ static ssize_t fuse_send_write(struct fuse_io_args *ia, loff_t pos,
10661066
return err ?: ia->write.out.size;
10671067
}
10681068

1069-
bool fuse_write_update_size(struct inode *inode, loff_t pos)
1069+
bool fuse_write_update_attr(struct inode *inode, loff_t pos)
10701070
{
10711071
struct fuse_conn *fc = get_fuse_conn(inode);
10721072
struct fuse_inode *fi = get_fuse_inode(inode);
@@ -1263,7 +1263,7 @@ static ssize_t fuse_perform_write(struct kiocb *iocb,
12631263
} while (!err && iov_iter_count(ii));
12641264

12651265
if (res > 0)
1266-
fuse_write_update_size(inode, pos);
1266+
fuse_write_update_attr(inode, pos);
12671267

12681268
clear_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);
12691269
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)
15581558
}
15591559
fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);
15601560
if (res > 0)
1561-
fuse_write_update_size(inode, iocb->ki_pos);
1561+
fuse_write_update_attr(inode, iocb->ki_pos);
15621562
inode_unlock(inode);
15631563

15641564
return res;
@@ -2901,7 +2901,7 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
29012901

29022902
if (iov_iter_rw(iter) == WRITE) {
29032903
if (ret > 0)
2904-
fuse_write_update_size(inode, pos);
2904+
fuse_write_update_attr(inode, pos);
29052905
else if (ret < 0 && offset + count > i_size)
29062906
fuse_do_truncate(file);
29072907
}
@@ -2990,7 +2990,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
29902990

29912991
/* we could have extended the file */
29922992
if (!(mode & FALLOC_FL_KEEP_SIZE)) {
2993-
bool changed = fuse_write_update_size(inode, offset + length);
2993+
bool changed = fuse_write_update_attr(inode, offset + length);
29942994

29952995
if (changed && fm->fc->writeback_cache)
29962996
file_update_time(file);
@@ -3108,7 +3108,7 @@ static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in,
31083108
ALIGN(pos_out + outarg.size, PAGE_SIZE) - 1);
31093109

31103110
if (fc->writeback_cache) {
3111-
fuse_write_update_size(inode_out, pos_out + outarg.size);
3111+
fuse_write_update_attr(inode_out, pos_out + outarg.size);
31123112
file_update_time(file_out);
31133113
}
31143114

fs/fuse/fuse_i.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ long fuse_ioctl_common(struct file *file, unsigned int cmd,
12171217
__poll_t fuse_file_poll(struct file *file, poll_table *wait);
12181218
int fuse_dev_release(struct inode *inode, struct file *file);
12191219

1220-
bool fuse_write_update_size(struct inode *inode, loff_t pos);
1220+
bool fuse_write_update_attr(struct inode *inode, loff_t pos);
12211221

12221222
int fuse_flush_times(struct inode *inode, struct fuse_file *ff);
12231223
int fuse_write_inode(struct inode *inode, struct writeback_control *wbc);

0 commit comments

Comments
 (0)