Diff below uses the, already calculated, number of read-ahead buffers to
pass the correct size to free(9).
While here I unified the two loops calculating this number of buffers,
as we know for sure the first one isn't NULL.
ok?
Index: kern/vfs_bio.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_bio.c,v
retrieving revision 1.186
diff -u -p -u -6 -r1.186 vfs_bio.c
--- kern/vfs_bio.c 13 Aug 2018 15:26:17 -0000 1.186
+++ kern/vfs_bio.c 14 Nov 2018 18:21:48 -0000
@@ -535,13 +535,13 @@ bread_cluster_callback(struct buf *bp)
buf_fix_mapping(bp, newsize);
bp->b_bcount = newsize;
}
/* Invalidate read-ahead buffers if read short */
if (bp->b_resid > 0) {
- for (i = 0; xbpp[i] != NULL; i++)
+ for (i = 1; xbpp[i] != NULL; i++)
continue;
for (i = i - 1; i != 0; i--) {
if (xbpp[i]->b_bufsize <= bp->b_resid) {
bp->b_resid -= xbpp[i]->b_bufsize;
SET(xbpp[i]->b_flags, B_INVAL);
} else if (bp->b_resid > 0) {
@@ -555,13 +555,13 @@ bread_cluster_callback(struct buf *bp)
for (i = 1; xbpp[i] != NULL; i++) {
if (ISSET(bp->b_flags, B_ERROR))
SET(xbpp[i]->b_flags, B_INVAL | B_ERROR);
biodone(xbpp[i]);
}
- free(xbpp, M_TEMP, 0);
+ free(xbpp, M_TEMP, (i + 1) * sizeof(*xbpp));
if (ISSET(bp->b_flags, B_ASYNC)) {
brelse(bp);
} else {
CLR(bp->b_flags, B_WANTED);
wakeup(bp);
@@ -600,13 +600,13 @@ bread_cluster(struct vnode *vp, daddr_t
goto out;
howmany = MAXPHYS / size;
if (howmany > maxra)
howmany = maxra;
- xbpp = mallocarray(howmany + 1, sizeof(struct buf *), M_TEMP, M_NOWAIT);
+ xbpp = mallocarray(howmany + 1, sizeof(*xbpp), M_TEMP, M_NOWAIT);
if (xbpp == NULL)
goto out;
for (i = howmany - 1; i >= 0; i--) {
size_t sz;
@@ -619,13 +619,13 @@ bread_cluster(struct vnode *vp, daddr_t
xbpp[i] = buf_get(vp, blkno + i + 1, sz);
if (xbpp[i] == NULL) {
for (++i; i < howmany; i++) {
SET(xbpp[i]->b_flags, B_INVAL);
brelse(xbpp[i]);
}
- free(xbpp, M_TEMP, 0);
+ free(xbpp, M_TEMP, (howmany + 1) * sizeof(*xbpp));
goto out;
}
}
bp = xbpp[0];