]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
libxfs: remove never-read "offset" assignment in readbufr_map & writebufr
authorEric Sandeen <sandeen@sandeen.net>
Mon, 14 Apr 2014 06:13:58 +0000 (16:13 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 14 Apr 2014 06:13:58 +0000 (16:13 +1000)
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 <sandeen@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
libxfs/rdwr.c

index 9887423f7309d3c0f29b7f92962bc7e840a89dcc..7208a2f0be86e672d4f7b5d7dd8e28c32863d4c5 100644 (file)
@@ -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;
                }
        }