From: Darrick J. Wong <djwong@xxxxxxxxxx> Improve the tracing for fallocate by reporting the inode number and the file range in all tracepoints. Make the ranges hexadecimal to make it easier for the programmer to convert bytes to block numbers and back. Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx> --- misc/fuse2fs.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c index a8fb18650ec080..f7d17737459c11 100644 --- a/misc/fuse2fs.c +++ b/misc/fuse2fs.c @@ -4683,8 +4683,8 @@ static int fuse2fs_allocate_range(struct fuse2fs *ff, start = FUSE2FS_B_TO_FSBT(ff, offset); end = FUSE2FS_B_TO_FSBT(ff, offset + len - 1); - dbg_printf(ff, "%s: ino=%d mode=0x%x start=%llu end=%llu\n", __func__, - fh->ino, mode, start, end); + dbg_printf(ff, "%s: ino=%d mode=0x%x offset=0x%jx len=0x%jx start=%llu end=%llu\n", + __func__, fh->ino, mode, offset, len, start, end); if (!fs_can_allocate(ff, FUSE2FS_B_TO_FSB(ff, len))) return -ENOSPC; @@ -4751,6 +4751,7 @@ static errcode_t clean_block_middle(struct fuse2fs *ff, ext2_ino_t ino, if (err) return err; + dbg_printf(ff, "%s: ino=%d offset=0x%jx len=0x%jx\n", __func__, ino, offset + residue, len); memset(*buf + residue, 0, len); return io_channel_write_tagblk(fs->io, ino, blk, 1, *buf); @@ -4787,10 +4788,15 @@ static errcode_t clean_block_edge(struct fuse2fs *ff, ext2_ino_t ino, if (!blk || (retflags & BMAP_RET_UNINIT)) return 0; - if (clean_before) + if (clean_before) { + dbg_printf(ff, "%s: ino=%d before offset=0x%jx len=0x%jx\n", + __func__, ino, offset, residue); memset(*buf, 0, residue); - else + } else { + dbg_printf(ff, "%s: ino=%d after offset=0x%jx len=0x%jx\n", + __func__, ino, offset, fs->blocksize - residue); memset(*buf + residue, 0, fs->blocksize - residue); + } return io_channel_write_tagblk(fs->io, ino, blk, 1, *buf); } @@ -4805,9 +4811,6 @@ static int fuse2fs_punch_range(struct fuse2fs *ff, errcode_t err; char *buf = NULL; - dbg_printf(ff, "%s: offset=%jd len=%jd\n", __func__, - (intmax_t) offset, (intmax_t) len); - /* kernel ext4 punch requires this flag to be set */ if (!(mode & FL_KEEP_SIZE_FLAG)) return -EINVAL; @@ -4900,6 +4903,12 @@ static int op_fallocate(const char *path EXT2FS_ATTR((unused)), int mode, ret = -EROFS; goto out; } + + dbg_printf(ff, "%s: ino=%d mode=0x%x start=0x%llx end=0x%llx\n", __func__, + fh->ino, mode, + (unsigned long long)offset, + (unsigned long long)offset + len); + if (mode & FL_ZERO_RANGE_FLAG) ret = fuse2fs_zero_range(ff, fh, mode, offset, len); else if (mode & FL_PUNCH_HOLE_FLAG)