Patch "brd: decrease the number of allocated pages which discarded" has been added to the 6.12-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    brd: decrease the number of allocated pages which discarded

to the 6.12-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     brd-decrease-the-number-of-allocated-pages-which-dis.patch
and it can be found in the queue-6.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 48702e2fabc3951de803d51cb9b9898cd628381a
Author: Zhang Xianwei <zhang.xianwei8@xxxxxxxxxx>
Date:   Thu Nov 28 17:00:56 2024 +0800

    brd: decrease the number of allocated pages which discarded
    
    [ 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@xxxxxxxxxx>
    Reviewed-by: Ming Lei <ming.lei@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20241128170056565nPKSz2vsP8K8X2uk2iaDG@xxxxxxxxxx
    Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 5a95671d81515..292f127cae0ab 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -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;
 	}