github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 20:54:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

fs/ntfs3: Rename 'err' to 'ret' in read paths

Browse Source 
ntfs_file_read_iter() and ntfs_file_splice_read() store both error codes
and the number of bytes transferred in a variable named 'err', which is
misleading on the success path. Rename it to 'ret'.

While here, rename the 'in' parameter of ntfs_file_splice_read() to
'file' for consistency with the rest of the file, and add a local 'ni'
instead of calling ntfs_i() inline.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
Konstantin Komarov 2026-07-30 10:44:47 +02:00
parent 194491be54
commit 539eb2a869
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fs/ntfs3/file.c
View File

@ -820,11 +820,11 @@ static ssize_t ntfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
size_t bytes = iov_iter_count(iter);
loff_t valid, i_size, vbo, end;
unsigned int dio_flags;
ssize_t err;
ssize_t ret;
err = check_read_restriction(inode);
if (err)
return err;
ret = check_read_restriction(inode);
if (ret)
return ret;
if (!bytes)
return 0; /* skip atime */
@ -867,17 +867,17 @@ static ssize_t ntfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
if (ni->file.run_da.count) {
/* Direct I/O is not compatible with delalloc. */
err = ni_allocate_da_blocks(ni);
if (err)
ret = ni_allocate_da_blocks(ni);
if (ret)
goto out;
}
err = iomap_dio_rw(iocb, iter, &ntfs_iomap_ops, NULL, dio_flags,
ret = iomap_dio_rw(iocb, iter, &ntfs_iomap_ops, NULL, dio_flags,
NULL, 0);
if (err <= 0)
if (ret <= 0)
goto out;
end = vbo + err;
end = vbo + ret;
if (valid < end) {
size_t to_zero = end - valid;
/* Fix iter. */
@ -889,35 +889,36 @@ static ssize_t ntfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
bytes = i_size - vbo;
iov_iter_zero(bytes, iter);
iocb->ki_pos += bytes;
err = bytes;
ret = bytes;
}
out:
inode_unlock_shared(inode);
file_accessed(file);
return err;
return ret;
}
/*
* ntfs_file_splice_read - file_operations::splice_read
*/
static ssize_t ntfs_file_splice_read(struct file *in, loff_t *ppos,
static ssize_t ntfs_file_splice_read(struct file *file, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags)
{
struct inode *inode = file_inode(in);
ssize_t err;
struct inode *inode = file_inode(file);
struct ntfs_inode *ni = ntfs_i(inode);
ssize_t ret;
err = check_read_restriction(inode);
if (err)
return err;
ret = check_read_restriction(inode);
if (ret)
return ret;
if (is_compressed(ntfs_i(inode))) {
if (is_compressed(ni)) {
/* Turn off readahead for compressed files. */
in->f_ra.ra_pages = 0;
file->f_ra.ra_pages = 0;
}
return filemap_splice_read(in, ppos, pipe, len, flags);
return filemap_splice_read(file, ppos, pipe, len, flags);
}
/*