From f5c27d128621c94077d5f903b3b30e7cb4ef3f3c Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Tue, 12 May 2020 10:20:50 -0700 Subject: [PATCH] remove unneeded member drc_err of dmu_recv_cookie_t The member drc_err of dmu_recv_cookie_t is used only locally in receive_read, so we can replace it with a local variable. Signed-off-by: Matthew Ahrens --- include/sys/dmu_recv.h | 1 - module/zfs/dmu_recv.c | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/sys/dmu_recv.h b/include/sys/dmu_recv.h index c0a562115a20..ed041ba70b73 100644 --- a/include/sys/dmu_recv.h +++ b/include/sys/dmu_recv.h @@ -73,7 +73,6 @@ typedef struct dmu_recv_cookie { struct receive_record_arg *drc_next_rrd; zio_cksum_t drc_cksum; zio_cksum_t drc_prev_cksum; - int drc_err; /* Sorted list of objects not to issue prefetches for. */ objlist_t *drc_ignore_objlist; } dmu_recv_cookie_t; diff --git a/module/zfs/dmu_recv.c b/module/zfs/dmu_recv.c index aaeaa4c34f7a..ed52b25e6187 100644 --- a/module/zfs/dmu_recv.c +++ b/module/zfs/dmu_recv.c @@ -1217,10 +1217,8 @@ receive_read(dmu_recv_cookie_t *drc, int len, void *buf) while (done < len) { ssize_t resid; - zfs_file_t *fp; - - fp = drc->drc_fp; - drc->drc_err = zfs_file_read(fp, (char *)buf + done, + zfs_file_t *fp = drc->drc_fp; + int err = zfs_file_read(fp, (char *)buf + done, len - done, &resid); if (resid == len - done) { /* @@ -1228,12 +1226,12 @@ receive_read(dmu_recv_cookie_t *drc, int len, void *buf) * that the receive was interrupted and can * potentially be resumed. */ - drc->drc_err = SET_ERROR(ZFS_ERR_STREAM_TRUNCATED); + err = SET_ERROR(ZFS_ERR_STREAM_TRUNCATED); } drc->drc_voff += len - done - resid; done = len - resid; - if (drc->drc_err != 0) - return (drc->drc_err); + if (err != 0) + return (err); } drc->drc_bytes_read += len;