ammarfaizi2 · ammarfaizi2 · Nov 1, 2021 · Oct 14, 2021 · Sep 20, 2021 · Sep 20, 2021
diff --git a/Makefile b/Makefile
@@ -1115,7 +1115,8 @@ export MODORDER := $(extmod_prefix)modules.order
 export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps
 
 ifeq ($(KBUILD_EXTMOD),)
-core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
+core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/
+core-$(CONFIG_BLOCK) += block/
 
 vmlinux-dirs := $(patsubst %/,%,$(filter %/, \
  $(core-y) $(core-m) $(drivers-y) $(drivers-m) \

diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c
@@ -58,7 +58,7 @@ struct nfhd_device {
  struct gendisk *disk;
 };
 
-static blk_qc_t nfhd_submit_bio(struct bio *bio)
+static void nfhd_submit_bio(struct bio *bio)
 {
  struct nfhd_device *dev = bio->bi_bdev->bd_disk->private_data;
  struct bio_vec bvec;
@@ -76,7 +76,6 @@ static blk_qc_t nfhd_submit_bio(struct bio *bio)
  sec += len;
  }
  bio_endio(bio);
- return BLK_QC_T_NONE;
 }
 
 static int nfhd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
@@ -100,6 +99,7 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)
 {
  struct nfhd_device *dev;
  int dev_id = id - NFHD_DEV_OFFSET;
+ int err = -ENOMEM;
 
  pr_info("nfhd%u: found device with %u blocks (%u bytes)\n", dev_id,
  blocks, bsize);
@@ -130,16 +130,20 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)
  sprintf(dev->disk->disk_name, "nfhd%u", dev_id);
  set_capacity(dev->disk, (sector_t)blocks * (bsize / 512));
  blk_queue_logical_block_size(dev->disk->queue, bsize);
- add_disk(dev->disk);
+ err = add_disk(dev->disk);
+ if (err)
+ goto out_cleanup_disk;
 
  list_add_tail(&dev->list, &nfhd_list);
 
  return 0;
 
+out_cleanup_disk:
+ blk_cleanup_disk(dev->disk);
 free_dev:
  kfree(dev);
 out:
- return -ENOMEM;
+ return err;
 }
 
 static int __init nfhd_init(void)

diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c
@@ -16,7 +16,6 @@
 #include <linux/console.h>
 #include <linux/memblock.h>
 #include <linux/ioport.h>
-#include <linux/blkdev.h>
 
 #include <asm/bootinfo.h>
 #include <asm/mach-rc32434/ddr.h>

diff --git a/arch/mips/sibyte/common/cfe.c b/arch/mips/sibyte/common/cfe.c
@@ -7,7 +7,6 @@
 #include <linux/kernel.h>
 #include <linux/linkage.h>
 #include <linux/mm.h>
-#include <linux/blkdev.h>
 #include <linux/memblock.h>
 #include <linux/pm.h>
 #include <linux/smp.h>

diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
@@ -11,7 +11,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/memblock.h>
-#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/screen_info.h>

diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
@@ -25,7 +25,6 @@
 #include <linux/memblock.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/blkdev.h> /* for initrd_* */
 #include <linux/pagemap.h>
 
 #include <asm/pgalloc.h>

diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -21,6 +21,7 @@
 #include <linux/namei.h>
 #include <linux/pagemap.h>
 #include <linux/poll.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 
 #include <asm/prom.h>

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
@@ -27,6 +27,7 @@
 #include <linux/blk-mq.h>
 #include <linux/ata.h>
 #include <linux/hdreg.h>
+#include <linux/major.h>
 #include <linux/cdrom.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -854,8 +855,8 @@ static const struct attribute_group *ubd_attr_groups[] = {
  NULL,
 };
 
-static void ubd_disk_register(int major, u64 size, int unit,
-  struct gendisk *disk)
+static int ubd_disk_register(int major, u64 size, int unit,
+ struct gendisk *disk)
 {
  disk->major = major;
  disk->first_minor = unit << UBD_SHIFT;
@@ -872,7 +873,7 @@ static void ubd_disk_register(int major, u64 size, int unit,
 
  disk->private_data = &ubd_devs[unit];
  disk->queue = ubd_devs[unit].queue;
- device_add_disk(&ubd_devs[unit].pdev.dev, disk, ubd_attr_groups);
+ return device_add_disk(&ubd_devs[unit].pdev.dev, disk, ubd_attr_groups);
 }
 
 #define ROUND_BLOCK(n) ((n + (SECTOR_SIZE - 1)) & (-SECTOR_SIZE))
@@ -919,10 +920,15 @@ static int ubd_add(int n, char **error_out)
  blk_queue_write_cache(ubd_dev->queue, true, false);
  blk_queue_max_segments(ubd_dev->queue, MAX_SG);
  blk_queue_segment_boundary(ubd_dev->queue, PAGE_SIZE - 1);
- ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, disk);
+ err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, disk);
+ if (err)
+ goto out_cleanup_disk;
+
  ubd_gendisk[n] = disk;
  return 0;
 
+out_cleanup_disk:
+ blk_cleanup_disk(disk);
 out_cleanup_tags:
  blk_mq_free_tag_set(&ubd_dev->tag_set);
 out:

diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c
@@ -100,7 +100,7 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector,
  spin_unlock(&dev->lock);
 }
 
-static blk_qc_t simdisk_submit_bio(struct bio *bio)
+static void simdisk_submit_bio(struct bio *bio)
 {
  struct simdisk *dev = bio->bi_bdev->bd_disk->private_data;
  struct bio_vec bvec;
@@ -118,7 +118,6 @@ static blk_qc_t simdisk_submit_bio(struct bio *bio)
  }
 
  bio_endio(bio);
- return BLK_QC_T_NONE;
 }
 
 static int simdisk_open(struct block_device *bdev, fmode_t mode)
@@ -259,6 +258,7 @@ static int __init simdisk_setup(struct simdisk *dev, int which,
  struct proc_dir_entry *procdir)
 {
  char tmp[2] = { '0' + which, 0 };
+ int err = -ENOMEM;
 
  dev->fd = -1;
  dev->filename = NULL;
@@ -267,18 +267,26 @@ static int __init simdisk_setup(struct simdisk *dev, int which,
 
  dev->gd = blk_alloc_disk(NUMA_NO_NODE);
  if (!dev->gd)
- return -ENOMEM;
+ goto out;
  dev->gd->major = simdisk_major;
  dev->gd->first_minor = which;
  dev->gd->minors = SIMDISK_MINORS;
  dev->gd->fops = &simdisk_ops;
  dev->gd->private_data = dev;
  snprintf(dev->gd->disk_name, 32, "simdisk%d", which);
  set_capacity(dev->gd, 0);
- add_disk(dev->gd);
+ err = add_disk(dev->gd);
+ if (err)
+ goto out_cleanup_disk;
 
  dev->procfile = proc_create_data(tmp, 0644, procdir, &simdisk_proc_ops, dev);
+
  return 0;
+
+out_cleanup_disk:
+ blk_cleanup_disk(dev->gd);
+out:
+ return err;
 }
 
 static int __init simdisk_init(void)

diff --git a/block/Kconfig b/block/Kconfig
@@ -73,7 +73,7 @@ config BLK_DEV_ZONED
 
 config BLK_DEV_THROTTLING
  bool "Block layer bio throttling support"
- depends on BLK_CGROUP=y
+ depends on BLK_CGROUP
  select BLK_CGROUP_RWSTAT
  help
  Block layer bio throttling support. It can be used to limit
@@ -112,7 +112,7 @@ config BLK_WBT_MQ
 
 config BLK_CGROUP_IOLATENCY
  bool "Enable support for latency based cgroup IO protection"
- depends on BLK_CGROUP=y
+ depends on BLK_CGROUP
  help
  Enabling this option enables the .latency interface for IO throttling.
  The IO controller will attempt to maintain average IO latencies below
@@ -132,7 +132,7 @@ config BLK_CGROUP_FC_APPID
 
 config BLK_CGROUP_IOCOST
  bool "Enable support for cost model based cgroup IO controller"
- depends on BLK_CGROUP=y
+ depends on BLK_CGROUP
  select BLK_RQ_IO_DATA_LEN
  select BLK_RQ_ALLOC_TIME
  help
@@ -190,39 +190,31 @@ config BLK_INLINE_ENCRYPTION_FALLBACK
  by falling back to the kernel crypto API when inline
  encryption hardware is not present.
 
-menu "Partition Types"
-
 source "block/partitions/Kconfig"
 
-endmenu
-
-endif # BLOCK
-
 config BLOCK_COMPAT
- bool
- depends on BLOCK && COMPAT
- default y
+ def_bool COMPAT
 
 config BLK_MQ_PCI
- bool
- depends on BLOCK && PCI
- default y
+ def_bool PCI
 
 config BLK_MQ_VIRTIO
  bool
- depends on BLOCK && VIRTIO
+ depends on VIRTIO
  default y
 
 config BLK_MQ_RDMA
  bool
- depends on BLOCK && INFINIBAND
+ depends on INFINIBAND
  default y
 
 config BLK_PM
- def_bool BLOCK && PM
+ def_bool PM
 
 # do not use in new code
 config BLOCK_HOLDER_DEPRECATED
  bool
 
 source "block/Kconfig.iosched"
+
+endif # BLOCK
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-if BLOCK
-
 menu "IO Schedulers"
 
 config MQ_IOSCHED_DEADLINE
@@ -45,5 +43,3 @@ config BFQ_CGROUP_DEBUG
  files in a cgroup which can be useful for debugging.
 
 endmenu
-
-endif
diff --git a/block/Makefile b/block/Makefile
@@ -3,7 +3,7 @@
 # Makefile for the kernel block layer
 #
 
-obj-$(CONFIG_BLOCK) := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \
+obj-y := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \
  blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
  blk-exec.o blk-merge.o blk-timeout.o \
  blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \

diff --git a/block/bdev.c b/block/bdev.c
@@ -12,6 +12,7 @@
 #include <linux/major.h>
 #include <linux/device_cgroup.h>
 #include <linux/blkdev.h>
+#include <linux/blk-integrity.h>
 #include <linux/backing-dev.h>
 #include <linux/module.h>
 #include <linux/blkpg.h>
@@ -326,12 +327,12 @@ int bdev_read_page(struct block_device *bdev, sector_t sector,
  if (!ops->rw_page || bdev_get_integrity(bdev))
  return result;
 
- result = blk_queue_enter(bdev->bd_disk->queue, 0);
+ result = blk_queue_enter(bdev_get_queue(bdev), 0);
  if (result)
  return result;
  result = ops->rw_page(bdev, sector + get_start_sect(bdev), page,
  REQ_OP_READ);
- blk_queue_exit(bdev->bd_disk->queue);
+ blk_queue_exit(bdev_get_queue(bdev));
  return result;
 }
 
@@ -362,7 +363,7 @@ int bdev_write_page(struct block_device *bdev, sector_t sector,
 
  if (!ops->rw_page || bdev_get_integrity(bdev))
  return -EOPNOTSUPP;
- result = blk_queue_enter(bdev->bd_disk->queue, 0);
+ result = blk_queue_enter(bdev_get_queue(bdev), 0);
  if (result)
  return result;
 
@@ -375,7 +376,7 @@ int bdev_write_page(struct block_device *bdev, sector_t sector,
  clean_page_buffers(page);
  unlock_page(page);
  }
- blk_queue_exit(bdev->bd_disk->queue);
+ blk_queue_exit(bdev_get_queue(bdev));
  return result;
 }
 
@@ -492,6 +493,7 @@ struct block_device *bdev_alloc(struct gendisk *disk, u8 partno)
  spin_lock_init(&bdev->bd_size_lock);
  bdev->bd_partno = partno;
  bdev->bd_inode = inode;
+ bdev->bd_queue = disk->queue;
  bdev->bd_stats = alloc_percpu(struct disk_stats);
  if (!bdev->bd_stats) {
  iput(inode);

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
@@ -6,13 +6,13 @@
 #include <linux/slab.h>
 #include <linux/blkdev.h>
 #include <linux/cgroup.h>
-#include <linux/elevator.h>
 #include <linux/ktime.h>
 #include <linux/rbtree.h>
 #include <linux/ioprio.h>
 #include <linux/sbitmap.h>
 #include <linux/delay.h>
 
+#include "elevator.h"
 #include "bfq-iosched.h"
 
 #ifdef CONFIG_BFQ_CGROUP_DEBUG

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
@@ -117,7 +117,6 @@
 #include <linux/slab.h>
 #include <linux/blkdev.h>
 #include <linux/cgroup.h>
-#include <linux/elevator.h>
 #include <linux/ktime.h>
 #include <linux/rbtree.h>
 #include <linux/ioprio.h>
@@ -127,6 +126,7 @@
 
 #include <trace/events/block.h>
 
+#include "elevator.h"
 #include "blk.h"
 #include "blk-mq.h"
 #include "blk-mq-tag.h"
@@ -6884,8 +6884,8 @@ static void bfq_depth_updated(struct blk_mq_hw_ctx *hctx)
  struct blk_mq_tags *tags = hctx->sched_tags;
  unsigned int min_shallow;
 
- min_shallow = bfq_update_depths(bfqd, tags->bitmap_tags);
- sbitmap_queue_min_shallow_depth(tags->bitmap_tags, min_shallow);
+ min_shallow = bfq_update_depths(bfqd, &tags->bitmap_tags);
+ sbitmap_queue_min_shallow_depth(&tags->bitmap_tags, min_shallow);
 }
 
 static int bfq_init_hctx(struct blk_mq_hw_ctx *hctx, unsigned int index)