fuse2fs: don't let ENOENT escape from ioctl_fitrim

If ext2fs_find_first_set_block_bitmap2 returns ENOENT to indicate
that there are no bits set between start and b, then the entire region
is free space and we can discard it.  In that case, zero out err so that
it won't get returned as an error.

Cc: <linux-ext4@vger.kernel.org> # v1.43
Fixes: 81cbf1ef4f5dab ("misc: add fuse2fs, a FUSE server for e2fsprogs")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>

diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index 1debbd3355ec8fd63c993a316348f0089207da2e..d670c5db1206f2134bb9d5cf7f68729f5676e318 100644 (file)
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -3991,8 +3991,20 @@ static int ioctl_fitrim(struct fuse2fs *ff, struct fuse2fs_file_handle *fh,
                b = start + max_blocks < end ? start + max_blocks : end;
                err =  ext2fs_find_first_set_block_bitmap2(fs->block_map,
                                                           start, b, &b);
-               if (err && err != ENOENT)
+               switch (err) {
+               case 0:
+                       break;
+               case ENOENT:
+                       /*
+                        * No free blocks found between start and b; discard
+                        * the entire range.
+                        */
+                       err = 0;
+                       break;
+               default:
                        return translate_error(fs, fh->ino, err);
+               }
+
                if (b - start >= minlen) {
                        err = io_channel_discard(fs->io, start, b - start);
                        if (err)