apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: fix brain-o in fallocate log dump

Browse Source 
fsx segvs when dumping fallocate log entries. Fix magic string
array index parameters to be zero based rather than one based.

While touching log string related stuff, make the format consistent
with read and write operations so the log dump is easier to look at
with the human eye.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Dave Chinner
2011-07-14 15:27:16 +10:00
committed by Dave Chinner
parent 5843147ef1
commit 77c0620248
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ltp/fsx.c
+15 -13
View File
@@ -252,14 +252,14 @@ logdump(void)
int opnum; int opnum;
opnum = i+1 + (logcount/LOGSIZE)*LOGSIZE; opnum = i+1 + (logcount/LOGSIZE)*LOGSIZE;
prt("%d(%d mod 256): ", opnum, opnum%256); prt("%d(%3d mod 256): ", opnum, opnum%256);
lp = &oplog[i]; lp = &oplog[i];
if ((closeopen = lp->operation < 0)) if ((closeopen = lp->operation < 0))
lp->operation = ~ lp->operation; lp->operation = ~ lp->operation;
switch (lp->operation) { switch (lp->operation) {
case OP_MAPREAD: case OP_MAPREAD:
prt("MAPREAD\t0x%x thru 0x%x\t(0x%x bytes)", prt("MAPREAD 0x%x thru 0x%x\t(0x%x bytes)",
lp->args[0], lp->args[0] + lp->args[1] - 1, lp->args[0], lp->args[0] + lp->args[1] - 1,
lp->args[1]); lp->args[1]);
if (badoff >= lp->args[0] && badoff < if (badoff >= lp->args[0] && badoff <
@@ -275,7 +275,7 @@ logdump(void)
prt("\t******WWWW"); prt("\t******WWWW");
break; break;
case OP_READ: case OP_READ:
prt("READ\t0x%x thru 0x%x\t(0x%x bytes)", prt("READ 0x%x thru 0x%x\t(0x%x bytes)",
lp->args[0], lp->args[0] + lp->args[1] - 1, lp->args[0], lp->args[0] + lp->args[1] - 1,
lp->args[1]); lp->args[1]);
if (badoff >= lp->args[0] && if (badoff >= lp->args[0] &&
@@ -283,7 +283,7 @@ logdump(void)
prt("\t***RRRR***"); prt("\t***RRRR***");
break; break;
case OP_WRITE: case OP_WRITE:
prt("WRITE\t0x%x thru 0x%x\t(0x%x bytes)", prt("WRITE 0x%x thru 0x%x\t(0x%x bytes)",
lp->args[0], lp->args[0] + lp->args[1] - 1, lp->args[0], lp->args[0] + lp->args[1] - 1,
lp->args[1]); lp->args[1]);
if (lp->args[0] > lp->args[2]) if (lp->args[0] > lp->args[2])
@@ -304,14 +304,15 @@ logdump(void)
break; break;
case OP_FALLOCATE: case OP_FALLOCATE:
/* 0: offset 1: length 2: where alloced */ /* 0: offset 1: length 2: where alloced */
prt("FALLOCATE %s\tfrom 0x%x to 0x%x", prt("FALLOC 0x%x thru 0x%x\t(0x%x bytes) %s",
falloc_type[lp->args[2]], lp->args[0], lp->args[0] + lp->args[1]); lp->args[0], lp->args[0] + lp->args[1],
lp->args[1], falloc_type[lp->args[2]]);
if (badoff >= lp->args[0] && if (badoff >= lp->args[0] &&
badoff < lp->args[0] + lp->args[1]) badoff < lp->args[0] + lp->args[1])
prt("\t******FFFF"); prt("\t******FFFF");
break; break;
case OP_PUNCH_HOLE: case OP_PUNCH_HOLE:
prt("PUNCH HOLE\t0x%x thru 0x%x\t(0x%x bytes)", prt("PUNCH 0x%x thru 0x%x\t(0x%x bytes)",
lp->args[0], lp->args[0] + lp->args[1] - 1, lp->args[0], lp->args[0] + lp->args[1] - 1,
lp->args[1]); lp->args[1]);
if (badoff >= lp->args[0] && badoff < if (badoff >= lp->args[0] && badoff <
@@ -906,12 +907,12 @@ do_preallocate(unsigned offset, unsigned length)
} }
/* /*
* last arg: * last arg matches fallocate string array index in logdump:
* 1: allocate past EOF * 0: allocate past EOF
* 2: extending prealloc * 1: extending prealloc
* 3: interior prealloc * 2: interior prealloc
*/ */
log4(OP_FALLOCATE, offset, length, (end_offset > file_size) ? (keep_size ? 1 : 2) : 3); log4(OP_FALLOCATE, offset, length, (end_offset > file_size) ? (keep_size ? 0 : 1) : 2);
if (end_offset > file_size) { if (end_offset > file_size) {
memset(good_buf + file_size, '\0', end_offset - file_size); memset(good_buf + file_size, '\0', end_offset - file_size);
@@ -924,7 +925,8 @@ do_preallocate(unsigned offset, unsigned length)
if ((progressinterval && testcalls % progressinterval == 0) || if ((progressinterval && testcalls % progressinterval == 0) ||
(debug && (monitorstart == -1 || monitorend == -1 || (debug && (monitorstart == -1 || monitorend == -1 ||
end_offset <= monitorend))) end_offset <= monitorend)))
prt("%lu falloc\tfrom 0x%x to 0x%x\n", testcalls, offset, length); prt("%lu falloc\tfrom 0x%x to 0x%x (0x%x bytes)\n", testcalls,
offset, offset + length, length);
if (fallocate(fd, keep_size ? FALLOC_FL_KEEP_SIZE : 0, (loff_t)offset, (loff_t)length) == -1) { if (fallocate(fd, keep_size ? FALLOC_FL_KEEP_SIZE : 0, (loff_t)offset, (loff_t)length) == -1) {
prt("fallocate: %x to %x\n", offset, length); prt("fallocate: %x to %x\n", offset, length);
prterr("do_preallocate: fallocate"); prterr("do_preallocate: fallocate");