Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 11:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfs: fix incorrect error handling in LOCALIO

Browse Source 
nfs4_stat_to_errno() expects a NFSv4 error code as an argument and
returns a POSIX errno.

The problem is LOCALIO is passing nfs4_stat_to_errno() the POSIX errno
return values from filp->f_op->read_iter(), filp->f_op->write_iter()
and vfs_fsync_range().

So the POSIX errno that nfs_local_pgio_done() and
nfs_local_commit_done() are passing to nfs4_stat_to_errno() are
failing to match any NFSv4 error code, which results in
nfs4_stat_to_errno() defaulting ot returning -EREMOTEIO. This causes
assertions in upper layers due to -EREMOTEIO not being a valid NFSv4
error code.

Fix this by updating nfs_local_pgio_done() and nfs_local_commit_done()
to use the new errno_to_nfs4_stat() to map a POSIX errno to an NFSv4
error code.

Fixes: 70ba381e1a431 ("nfs: add LOCALIO support")
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
This commit is contained in:
Mike Snitzer 2024-12-27 15:13:56 -05:00 committed by Anna Schumaker
parent 69d73de60b
commit 17da35c541
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/localio.c
View File

@ -388,7 +388,7 @@ nfs_local_pgio_done(struct nfs_pgio_header *hdr, long status)
hdr->res.op_status = NFS4_OK;
hdr->task.tk_status = 0;
} else {
hdr->res.op_status = nfs4_stat_to_errno(status);
hdr->res.op_status = errno_to_nfs4_stat(status);
hdr->task.tk_status = status;
}
}
@ -786,7 +786,7 @@ nfs_local_commit_done(struct nfs_commit_data *data, int status)
data->task.tk_status = 0;
} else {
nfs_reset_boot_verifier(data->inode);
data->res.op_status = nfs4_stat_to_errno(status);
data->res.op_status = errno_to_nfs4_stat(status);
data->task.tk_status = status;
}
}

19
fs/nfs_common/common.c
View File

@ -132,3 +132,22 @@ int nfs4_stat_to_errno(int stat)
return -stat;
}
EXPORT_SYMBOL_GPL(nfs4_stat_to_errno);
/*
* Convert an errno to an NFS error code.
*/
__u32 errno_to_nfs4_stat(int errno)
{
int i;
for (i = 0; i < ARRAY_SIZE(nfs4_errtbl); i++) {
if (nfs4_errtbl[i].errno == errno)
return nfs4_errtbl[i].stat;
}
/* If we cannot translate the error, the recovery routines should
* handle it.
* Note: remaining NFSv4 error codes have values > 10000, so should
* not conflict with native Linux error codes.
*/
return NFS4ERR_SERVERFAULT;
}
EXPORT_SYMBOL_GPL(errno_to_nfs4_stat);

2
include/linux/nfs_common.h
View File

@ -14,4 +14,6 @@
int nfs_stat_to_errno(enum nfs_stat status);
int nfs4_stat_to_errno(int stat);
__u32 errno_to_nfs4_stat(int errno);
#endif /* _LINUX_NFS_COMMON_H */