diff options
| author | Christian Brauner <brauner@kernel.org> | 2024-01-11 12:22:33 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-01-11 12:22:33 +0100 |
| commit | 1d5911d43cab5fb99229b02bce173b0c6d9da7d2 (patch) | |
| tree | a123abfdbd076fefaccb3562becd890e075767db /fs/netfs/direct_write.c | |
| parent | Merge tag 'netfs-lib-20240104' of ssh://gitolite.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | netfs: Fix wrong #ifdef hiding wait (diff) | |
| download | linux-1d5911d43cab5fb99229b02bce173b0c6d9da7d2.tar.gz linux-1d5911d43cab5fb99229b02bce173b0c6d9da7d2.zip | |
Merge tag 'netfs-lib-20240109' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into vfs.netfs
Pull netfs updates from David Howells:
A few follow-up fixes for the netfs work for this cycle.
* tag 'netfs-lib-20240109' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
netfs: Fix wrong #ifdef hiding wait
cachefiles: Fix signed/unsigned mixup
netfs: Fix the loop that unmarks folios after writing to the cache
netfs: Fix interaction between write-streaming and cachefiles culling
netfs: Count DIO writes
netfs: Mark netfs_unbuffered_write_iter_locked() static
Tested-by: Marc Dionne <marc.dionne@auristor.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/netfs/direct_write.c')
| -rw-r--r-- | fs/netfs/direct_write.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/netfs/direct_write.c b/fs/netfs/direct_write.c index aad05f2349a4..60a40d293c87 100644 --- a/fs/netfs/direct_write.c +++ b/fs/netfs/direct_write.c @@ -27,8 +27,8 @@ static void netfs_cleanup_dio_write(struct netfs_io_request *wreq) * Perform an unbuffered write where we may have to do an RMW operation on an * encrypted file. This can also be used for direct I/O writes. */ -ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter *iter, - struct netfs_group *netfs_group) +static ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter *iter, + struct netfs_group *netfs_group) { struct netfs_io_request *wreq; unsigned long long start = iocb->ki_pos; @@ -140,6 +140,7 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from) _enter("%llx,%zx,%llx", iocb->ki_pos, iov_iter_count(from), i_size_read(inode)); trace_netfs_write_iter(iocb, from); + netfs_stat(&netfs_n_rh_dio_write); ret = netfs_start_io_direct(inode); if (ret < 0) |