Merge tag 'block-6.0-2022-08-12' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / block / nbd.c

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 07f3c13..2a709da 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -11,6 +11,8 @@
  * (part of code stolen from loop.c)
  */
 
+#define pr_fmt(fmt) "nbd: " fmt
+
 #include <linux/major.h>
 
 #include <linux/blkdev.h>
@@ -250,7 +252,7 @@ static void nbd_dev_remove(struct nbd_device *nbd)
        struct gendisk *disk = nbd->disk;
 
        del_gendisk(disk);
-       blk_cleanup_disk(disk);
+       put_disk(disk);
        blk_mq_free_tag_set(&nbd->tag_set);
 
        /*
@@ -393,8 +395,7 @@ static u32 req_to_nbd_cmd_type(struct request *req)
        }
 }
 
-static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,
-                                                bool reserved)
+static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req)
 {
        struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req);
        struct nbd_device *nbd = cmd->nbd;
@@ -880,7 +881,7 @@ static void recv_work(struct work_struct *work)
        kfree(args);
 }
 
-static bool nbd_clear_req(struct request *req, void *data, bool reserved)
+static bool nbd_clear_req(struct request *req, void *data)
 {
        struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req);
 
@@ -1833,7 +1834,7 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
 out_free_work:
        destroy_workqueue(nbd->recv_workq);
 out_err_disk:
-       blk_cleanup_disk(disk);
+       put_disk(disk);
 out_free_idr:
        mutex_lock(&nbd_index_mutex);
        idr_remove(&nbd_index_idr, index);
@@ -1951,7 +1952,7 @@ again:
                             test_bit(NBD_DISCONNECT_REQUESTED, &nbd->flags)) ||
                            !refcount_inc_not_zero(&nbd->refs)) {
                                mutex_unlock(&nbd_index_mutex);
-                               pr_err("nbd: device at index %d is going down\n",
+                               pr_err("device at index %d is going down\n",
                                        index);
                                return -EINVAL;
                        }
@@ -1962,7 +1963,7 @@ again:
        if (!nbd) {
                nbd = nbd_dev_add(index, 2);
                if (IS_ERR(nbd)) {
-                       pr_err("nbd: failed to add new device\n");
+                       pr_err("failed to add new device\n");
                        return PTR_ERR(nbd);
                }
        }