From: Eric Sandeen Date: Mon, 14 Apr 2014 06:13:58 +0000 (+1000) Subject: libxfs: remove never-read "offset" assignment in readbufr_map & writebufr X-Git-Tag: v3.2.0-rc1~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e88719889e82a81b4c86ce1d9fc3efa64fd4ed3b;p=thirdparty%2Fxfsprogs-dev.git libxfs: remove never-read "offset" assignment in readbufr_map & writebufr libxfs_readbufr_map() & libxfs_writebufr() iterate over bp->b_map[] and read each chunk. The loops start out correctly, getting the offset from bm_bn and the length from bm_len. After the IO it correctly advances the target buffer pointer by len, but then inexplicably advances "offset" by len as well. The whole point of this exercise is to handle discontiguous ranges - marching offset along by length of IO done is incorrect. Thankfully offset is immediately reset to the proper value again at the top of the loop for the next range, so this is harmless, other than being confusing. Signed-off-by: Eric Sandeen Reviewed-by: Mark Tinguely Signed-off-by: Dave Chinner --- diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index 9887423f7..7208a2f0b 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -758,7 +758,6 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags) break; } buf += len; - offset += len; } if (!error) @@ -878,7 +877,6 @@ libxfs_writebufr(xfs_buf_t *bp) break; } buf += len; - offset += len; } }