From e7897043c6eff00593123f2b43075bebeb50934f Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Thu, 5 Aug 2021 14:45:46 -0600 Subject: [PATCH] LU-14160 tests: fix fsx logdump to fit in 80 chars Fix fsx logdump fallocate/truncate lines to fit within 80 columns. Remove spurious leading 0 for every operation length. Test-Parameters: trivial testlist=sanityn env=ONLY=16 Fixes: cb037f305c64 ("LU-14160 fallocate: Add punch mode to fallocate") Signed-off-by: Andreas Dilger Change-Id: I93460b62be8611926e620241232d886dee3ebbe5 Reviewed-on: https://review.whamcloud.com/44510 Tested-by: jenkins Reviewed-by: Arshad Hussain Tested-by: Maloo Reviewed-by: Mike Pershin Reviewed-by: Li Dongyang Reviewed-by: Oleg Drokin --- lustre/tests/fsx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/tests/fsx.c b/lustre/tests/fsx.c index 0d1b1d4..a013969 100644 --- a/lustre/tests/fsx.c +++ b/lustre/tests/fsx.c @@ -359,15 +359,15 @@ logdump(void) break; case OP_TRUNCATE: down = lp->args[0] < lp->args[1]; - prt("TRUNCATE %s\tfrom 0x%05x to 0x%05x", - down ? "DOWN" : "UP", lp->args[1], lp->args[0]); + prt("TRUNC%s 0x%05x to 0x%05x", + down ? "_DN" : "_UP", lp->args[1], lp->args[0]); if (badoff >= lp->args[!down] && badoff < lp->args[!!down]) - prt("\t******WWWW"); + prt("\t******TTTT"); break; case OP_FALLOCATE: /* 0: offset 1: length 2: where alloced */ - prt("FALLOC \tfrom 0x%05x to 0x%05x\t(0x%05x bytes)%s", + prt("FALLOC 0x%05x thru 0x%05x\t(0x%05x bytes)%s", lp->args[0], lp->args[0] + lp->args[1], lp->args[1], falloc_type[lp->args[2]]); if (badoff >= lp->args[0] && @@ -690,7 +690,7 @@ output_line(struct test_file *tf, int op, unsigned int offset, (monitorend == -1 || offset <= monitorend))))))) return; - prt("%06lu%s %lu.%06u %-10s %#08x %s %#08x\t(0x0%x bytes)\n", + prt("%06lu%s %lu.%06u %-10s %#08x %s %#08x\t(0x%x bytes)\n", testcalls, fill_tf_buf(tf), tv.tv_sec, (int)tv.tv_usec, ops[op], offset, op == OP_TRUNCATE || op == OP_PUNCH_HOLE ? " to " : "thru", offset + size - 1, -- 1.8.3.1