Merge tag 'rust-6.9' of https://github.com/Rust-for-Linux/linux

[sfrench/cifs-2.6.git] / drivers / s390 / block / dcssblk.c

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 4b7ecd4fd4319c000d2a4f1101022eafae0f2291..9c8f529b827cb3556e07bb0c3ed7ce51e5873cff 100644 (file)
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -546,6 +546,9 @@ static const struct attribute_group *dcssblk_dev_attr_groups[] = {
 static ssize_t
 dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
+       struct queue_limits lim = {
+               .logical_block_size     = 4096,
+       };
        int rc, i, j, num_of_segments;
        struct dcssblk_dev_info *dev_info;
        struct segment_info *seg_info, *temp;
@@ -629,9 +632,9 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
        dev_info->dev.release = dcssblk_release_segment;
        dev_info->dev.groups = dcssblk_dev_attr_groups;
        INIT_LIST_HEAD(&dev_info->lh);
-       dev_info->gd = blk_alloc_disk(NUMA_NO_NODE);
-       if (dev_info->gd == NULL) {
-               rc = -ENOMEM;
+       dev_info->gd = blk_alloc_disk(&lim, NUMA_NO_NODE);
+       if (IS_ERR(dev_info->gd)) {
+               rc = PTR_ERR(dev_info->gd);
                goto seg_list_del;
        }
        dev_info->gd->major = dcssblk_major;
@@ -639,7 +642,6 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
        dev_info->gd->fops = &dcssblk_devops;
        dev_info->gd->private_data = dev_info;
        dev_info->gd->flags |= GENHD_FL_NO_PART;
-       blk_queue_logical_block_size(dev_info->gd->queue, 4096);
        blk_queue_flag_set(QUEUE_FLAG_DAX, dev_info->gd->queue);
 
        seg_byte_size = (dev_info->end - dev_info->start + 1);