Linux-Block Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] null_blk: add helper for deleting the nullb_list
@ 2020-07-01  4:26 Chaitanya Kulkarni
  2020-07-01  7:26 ` Johannes Thumshirn
  0 siblings, 1 reply; 7+ messages in thread
From: Chaitanya Kulkarni @ 2020-07-01  4:26 UTC (permalink / raw)
  To: axboe; +Cc: linux-block, Chaitanya Kulkarni

The nullb_list is destroyed when error occurs in the null_init() and
when removing the module in null_exit(). The identical code is repeated
in those functions which can be a part of helper function. This also
removes the extra variable struct nullb *nullb in the both functions.
---
 drivers/block/null_blk_main.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index 82259242b9b5..870290f686ae 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -1859,11 +1859,23 @@ static int null_add_dev(struct nullb_device *dev)
 	return rv;
 }
 
+static void null_delete_nullb_list(void)
+{
+	struct nullb_device *dev;
+	struct nullb *nullb;
+
+	while (!list_empty(&nullb_list)) {
+		nullb = list_entry(nullb_list.next, struct nullb, list);
+		dev = nullb->dev;
+		null_del_dev(nullb);
+		null_free_dev(dev);
+	}
+}
+
 static int __init null_init(void)
 {
 	int ret = 0;
 	unsigned int i;
-	struct nullb *nullb;
 	struct nullb_device *dev;
 
 	if (g_bs > PAGE_SIZE) {
@@ -1930,12 +1942,7 @@ static int __init null_init(void)
 	return 0;
 
 err_dev:
-	while (!list_empty(&nullb_list)) {
-		nullb = list_entry(nullb_list.next, struct nullb, list);
-		dev = nullb->dev;
-		null_del_dev(nullb);
-		null_free_dev(dev);
-	}
+	null_delete_nullb_list();
 	unregister_blkdev(null_major, "nullb");
 err_conf:
 	configfs_unregister_subsystem(&nullb_subsys);
@@ -1947,21 +1954,12 @@ static int __init null_init(void)
 
 static void __exit null_exit(void)
 {
-	struct nullb *nullb;
-
 	configfs_unregister_subsystem(&nullb_subsys);
 
 	unregister_blkdev(null_major, "nullb");
 
 	mutex_lock(&lock);
-	while (!list_empty(&nullb_list)) {
-		struct nullb_device *dev;
-
-		nullb = list_entry(nullb_list.next, struct nullb, list);
-		dev = nullb->dev;
-		null_del_dev(nullb);
-		null_free_dev(dev);
-	}
+	null_delete_nullb_list();
 	mutex_unlock(&lock);
 
 	if (g_queue_mode == NULL_Q_MQ && shared_tags)
-- 
2.26.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, back to index

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-01  4:26 [PATCH] null_blk: add helper for deleting the nullb_list Chaitanya Kulkarni
2020-07-01  7:26 ` Johannes Thumshirn
2020-07-01 18:45   ` Chaitanya Kulkarni
2020-07-01 19:08     ` Jens Axboe
2020-07-01 21:38       ` Chaitanya Kulkarni
2020-07-01 21:46         ` Jens Axboe
2020-07-01 23:39           ` Chaitanya Kulkarni

Linux-Block Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-block/0 linux-block/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-block linux-block/ https://lore.kernel.org/linux-block \
		linux-block@vger.kernel.org
	public-inbox-index linux-block

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-block


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git