]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
fuse2fs: fix incorrect unit conversion at the end of FITRIM
authorDarrick J. Wong <djwong@kernel.org>
Sun, 6 Jul 2025 18:32:34 +0000 (11:32 -0700)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 31 Jul 2025 14:41:55 +0000 (10:41 -0400)
generic/260 also points out that the bytes cleared are in the wrong
units -- they're supposed to be in bytes, but the "cleared" variable is
in units of fsblocks.  Fix that.

Cc: linux-ext4@vger.kernel.org # v1.47.3-rc1
Fixes: 7235b58533b9cd ("fuse2fs: fix FITRIM validation")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/175182663095.1984706.13547873393931840622.stgit@frogsfrogsfrogs
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
misc/fuse2fs.c

index 34eaad1573132fa834d18c4070d9c903a04eebd1..ff8aa023d1c5555a4e19689d8232a8b151ace46e 100644 (file)
@@ -3831,7 +3831,8 @@ static int ioctl_fitrim(struct fuse2fs *ff, struct fuse2fs_file_handle *fh,
        }
 
 out:
-       fr->len = cleared;
+       fr->len = FUSE2FS_FSB_TO_B(ff, cleared);
+       dbg_printf(ff, "%s: len=%llu err=%ld\n", __func__, fr->len, err);
        return err;
 }
 #endif /* FITRIM */