]> git.hungrycats.org Git - linux/commitdiff
brd: decrease the number of allocated pages which discarded
authorZhang Xianwei <zhang.xianwei8@zte.com.cn>
Thu, 28 Nov 2024 09:00:56 +0000 (17:00 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:54:33 +0000 (13:54 +0100)
[ Upstream commit 82734209bedd65a8b508844bab652b464379bfdd ]

The number of allocated pages which discarded will not decrease.
Fix it.

Fixes: 9ead7efc6f3f ("brd: implement discard support")
Signed-off-by: Zhang Xianwei <zhang.xianwei8@zte.com.cn>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20241128170056565nPKSz2vsP8K8X2uk2iaDG@zte.com.cn
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/block/brd.c

index 5a95671d81515c094d46ddae2c347639c7bdfcd8..292f127cae0abe9f5f8dc8165946ddff9e60f99b 100644 (file)
@@ -231,8 +231,10 @@ static void brd_do_discard(struct brd_device *brd, sector_t sector, u32 size)
        xa_lock(&brd->brd_pages);
        while (size >= PAGE_SIZE && aligned_sector < rd_size * 2) {
                page = __xa_erase(&brd->brd_pages, aligned_sector >> PAGE_SECTORS_SHIFT);
-               if (page)
+               if (page) {
                        __free_page(page);
+                       brd->brd_nr_pages--;
+               }
                aligned_sector += PAGE_SECTORS;
                size -= PAGE_SIZE;
        }