s390/dasd: put block allocation in separate function

[ Upstream commit 2b43bf061b2e1b67561cbb1f6f305421f5fc86af ]

Put block allocation into a separate function to put some copy pair logic
in it in a later patch.

Signed-off-by: Stefan Haberland <sth@linux.ibm.com>
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
Link: https://lore.kernel.org/r/20220920192616.808070-2-sth@linux.ibm.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: c3116e62ddef ("s390/dasd: fix double module refcount decrement")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 56ab74aa07f42c4ff8b590f7c043d2a03fd74b1e..cf80db7a74a3d65c74d50a40fe6589830ef832eb 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -2028,6 +2028,25 @@ static void dasd_eckd_kick_validate_server(struct dasd_device *device)
                dasd_put_device(device);
 }
 
+static int dasd_eckd_alloc_block(struct dasd_device *device)
+{
+       struct dasd_block *block;
+       struct dasd_uid temp_uid;
+
+       dasd_eckd_get_uid(device, &temp_uid);
+       if (temp_uid.type == UA_BASE_DEVICE) {
+               block = dasd_alloc_block();
+               if (IS_ERR(block)) {
+                       DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
+                                       "could not allocate dasd block structure");
+                       return PTR_ERR(block);
+               }
+               device->block = block;
+               block->base = device;
+       }
+       return 0;
+}
+
 /*
  * Check device characteristics.
  * If the device is accessible using ECKD discipline, the device is enabled.
@@ -2036,8 +2055,6 @@ static int
 dasd_eckd_check_characteristics(struct dasd_device *device)
 {
        struct dasd_eckd_private *private = device->private;
-       struct dasd_block *block;
-       struct dasd_uid temp_uid;
        int rc, i;
        int readonly;
        unsigned long value;
@@ -2095,19 +2112,10 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                        device->default_expires = value;
        }
 
-       dasd_eckd_get_uid(device, &temp_uid);
-       if (temp_uid.type == UA_BASE_DEVICE) {
-               block = dasd_alloc_block();
-               if (IS_ERR(block)) {
-                       DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
-                                       "could not allocate dasd "
-                                       "block structure");
-                       rc = PTR_ERR(block);
-                       goto out_err1;
-               }
-               device->block = block;
-               block->base = device;
-       }
+       /* check if block device is needed and allocate in case */
+       rc = dasd_eckd_alloc_block(device);
+       if (rc)
+               goto out_err1;
 
        /* register lcu with alias handling, enable PAV */
        rc = dasd_alias_make_device_known_to_lcu(device);