From f5b9bdcb590e3af95010167b87022428f8a0c0ad Mon Sep 17 00:00:00 2001
From: Hou Tao <houtao1@huawei.com>
Date: Thu, 5 Aug 2021 21:36:24 +0800
Subject: [PATCH] Revert "block: call bdput() to avoid memleak"

hulk inclusion
category: bugfix
bugzilla: 55097
CVE: NA

-------------------------------------------------

This reverts commit d6dd218da2f8dd56ad7a563d9924222fd9770443.

The patch set for partition symlink cleanup will introduce
deadlock for nbd, loop and xen-blkfront driver, so revert it.

Signed-off-by: Hou Tao <houtao1@huawei.com>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 block/genhd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 657a4cfcc62f..be938088c440 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -792,10 +792,8 @@ void del_gendisk(struct gendisk *disk)
 		delete_partition(disk, part->partno);
 	}
 	disk_part_iter_exit(&piter);
-	if (bdev) {
+	if (bdev)
 		mutex_unlock(&bdev->bd_mutex);
-		bdput(bdev);
-	}
 
 	invalidate_partition(disk, 0);
 	bdev_unhash_inode(disk_devt(disk));
-- 
GitLab