From 360b9d5d71fb1de142ae4efd4660732476855a3f Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 4 Nov 2019 20:03:43 -0600 Subject: [PATCH] afs: Avoid -1 error for vreadUIO/vwriteUIO Commit c6b61a45 (afs: Verify osi_UFSOpen worked) added various checks to return an error if a given osi_UFSOpen failed. However, two of these checks (in afs_UFSReadUIO and afs_UFSWriteUIO) result in us returning -1 on error, in functions that otherwise return errno codes (e.g. ENOSPC). An error code of -1 might get interpreted as RX_CALL_DEAD, which would be rather confusing, so use EIO as a generic error instead. Change-Id: I23b9a73b82d999d8ee4670b5e7ec39b9d820fb0f Reviewed-on: https://gerrit.openafs.org/13931 Tested-by: BuildBot Reviewed-by: Mark Vitale Reviewed-by: Michael Meffie Reviewed-by: Benjamin Kaduk --- src/afs/VNOPS/afs_vnop_read.c | 2 +- src/afs/VNOPS/afs_vnop_write.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c index 369d60b..1a8ca87 100644 --- a/src/afs/VNOPS/afs_vnop_read.c +++ b/src/afs/VNOPS/afs_vnop_read.c @@ -486,7 +486,7 @@ afs_UFSReadUIO(afs_dcache_id_t *cacheId, struct uio *tuiop) tfile = (struct osi_file *) osi_UFSOpen(cacheId); if (!tfile) - return -1; + return EIO; #if defined(AFS_AIX41_ENV) AFS_GUNLOCK(); diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c index 5372af6..1c203ce 100644 --- a/src/afs/VNOPS/afs_vnop_write.c +++ b/src/afs/VNOPS/afs_vnop_write.c @@ -105,7 +105,7 @@ afs_UFSWriteUIO(struct vcache *avc, afs_dcache_id_t *inode, struct uio *tuiop) tfile = (struct osi_file *)osi_UFSOpen(inode); if (!tfile) - return -1; + return EIO; #if defined(AFS_AIX41_ENV) AFS_GUNLOCK(); -- 1.9.4