Re: bdi cleanups v3
On 7/28/20 9:41 AM, Jens Axboe wrote: > On 7/24/20 1:32 AM, Christoph Hellwig wrote: >> Hi Jens, >> >> this series contains a bunch of different BDI cleanups. The biggest item >> is to isolate block drivers from the BDI in preparation of changing the >> lifetime of the block device BDI in a follow up series. > > Applied, thanks. Dropped: CC block/blk-sysfs.o block/blk-sysfs.c:608:16: error: ‘blk_throtl_sample_show’ undeclared here (not in a function); did you mean ‘blk_throtl_sample_entry’? 608 | QUEUE_RW_ENTRY(blk_throtl_sample, "throttle_sample_time"); |^ block/blk-sysfs.c:563:10: note: in definition of macro ‘QUEUE_RW_ENTRY’ 563 | .show = _prefix##_show, \ | ^~~ block/blk-sysfs.c:608:16: error: ‘blk_throtl_sample_store’ undeclared here (not in a function); did you mean ‘blk_throtl_sample_entry’? 608 | QUEUE_RW_ENTRY(blk_throtl_sample, "throttle_sample_time"); |^ block/blk-sysfs.c:564:11: note: in definition of macro ‘QUEUE_RW_ENTRY’ 564 | .store = _prefix##_store, \ | ^~~ block/blk-sysfs.c:657:3: error: ‘blk_throtl_sample_time_entry’ undeclared here (not in a function); did you mean ‘blk_throtl_sample_time_store’? 657 | _throtl_sample_time_entry.attr, | ^~~~ | blk_throtl_sample_time_store block/blk-sysfs.c:608:16: warning: ‘blk_throtl_sample_entry’ defined but not used [-Wunused-variable] 608 | QUEUE_RW_ENTRY(blk_throtl_sample, "throttle_sample_time"); |^ block/blk-sysfs.c:561:33: note: in definition of macro ‘QUEUE_RW_ENTRY’ 561 | static struct queue_sysfs_entry _prefix##_entry = { \ | ^~~ make[1]: *** [scripts/Makefile.build:281: block/blk-sysfs.o] Error 1 make: *** [Makefile:1756: block] Error 2 from "block: add helper macros for queue sysfs entries" This has not seen a full compile test even... -- Jens Axboe
Re: bdi cleanups v3
On 7/24/20 1:32 AM, Christoph Hellwig wrote: > Hi Jens, > > this series contains a bunch of different BDI cleanups. The biggest item > is to isolate block drivers from the BDI in preparation of changing the > lifetime of the block device BDI in a follow up series. Applied, thanks. -- Jens Axboe
Re: bdi cleanups v3
On Sun, Jul 26, 2020 at 05:03:19PM +0200, Christoph Hellwig wrote: > Hi Jens, > > this series contains a bunch of different BDI cleanups. The biggest item > is to isolate block drivers from the BDI in preparation of changing the > lifetime of the block device BDI in a follow up series. Ooops, sorry for reposting this - it is exactly the same v3 I already posted.
bdi cleanups v3
Hi Jens, this series contains a bunch of different BDI cleanups. The biggest item is to isolate block drivers from the BDI in preparation of changing the lifetime of the block device BDI in a follow up series. Changes since v2: - fix a rw_page return value check - fix up various changelogs Changes since v1: - rebased to the for-5.9/block-merge branch - explicitly set the readahead to 0 for ubifs, vboxsf and mtd - split the zram block_device operations - let rw_page users fall back to bios in swap_readpage Diffstat: block/blk-core.c |2 block/blk-integrity.c |4 block/blk-mq-debugfs.c|1 block/blk-settings.c |5 block/blk-sysfs.c | 282 ++ block/genhd.c | 13 + drivers/block/aoe/aoeblk.c|2 drivers/block/brd.c |1 drivers/block/drbd/drbd_nl.c | 18 -- drivers/block/drbd/drbd_req.c |4 drivers/block/rbd.c |2 drivers/block/zram/zram_drv.c | 19 +- drivers/md/bcache/super.c |4 drivers/md/dm-table.c |9 - drivers/md/raid0.c| 16 -- drivers/md/raid10.c | 46 ++ drivers/md/raid5.c| 31 +--- drivers/mmc/core/queue.c |3 drivers/mtd/mtdcore.c |1 drivers/nvdimm/btt.c |2 drivers/nvdimm/pmem.c |1 drivers/nvme/host/core.c |3 drivers/nvme/host/multipath.c | 10 - drivers/scsi/iscsi_tcp.c |4 fs/9p/vfs_file.c |2 fs/9p/vfs_super.c |4 fs/afs/super.c|1 fs/btrfs/disk-io.c|2 fs/fs-writeback.c |7 - fs/fuse/inode.c |4 fs/namei.c|4 fs/nfs/super.c|9 - fs/super.c|2 fs/ubifs/super.c |1 fs/vboxsf/super.c |1 include/linux/backing-dev.h | 78 +-- include/linux/blkdev.h|3 include/linux/drbd.h |1 include/linux/fs.h|2 mm/backing-dev.c | 12 - mm/filemap.c |4 mm/memcontrol.c |2 mm/memory-failure.c |2 mm/migrate.c |2 mm/mmap.c |2 mm/page-writeback.c | 18 +- mm/page_io.c | 18 +- mm/swapfile.c |4 48 files changed, 204 insertions(+), 464 deletions(-)
bdi cleanups v3
Hi Jens, this series contains a bunch of different BDI cleanups. The biggest item is to isolate block drivers from the BDI in preparation of changing the lifetime of the block device BDI in a follow up series. Changes since v2: - fix a rw_page return value check - fix various changelogs Changes since v1: - rebased to the for-5.9/block-merge branch - explicitly set the readahead to 0 for ubifs, vboxsf and mtd - split the zram block_device operations - let rw_page users fall back to bios in swap_readpage Diffstat: block/blk-core.c |2 block/blk-integrity.c |4 block/blk-mq-debugfs.c|1 block/blk-settings.c |5 block/blk-sysfs.c | 282 ++ block/genhd.c | 13 + drivers/block/aoe/aoeblk.c|2 drivers/block/brd.c |1 drivers/block/drbd/drbd_nl.c | 18 -- drivers/block/drbd/drbd_req.c |4 drivers/block/rbd.c |2 drivers/block/zram/zram_drv.c | 19 +- drivers/md/bcache/super.c |4 drivers/md/dm-table.c |9 - drivers/md/raid0.c| 16 -- drivers/md/raid10.c | 46 ++ drivers/md/raid5.c| 31 +--- drivers/mmc/core/queue.c |3 drivers/mtd/mtdcore.c |1 drivers/nvdimm/btt.c |2 drivers/nvdimm/pmem.c |1 drivers/nvme/host/core.c |3 drivers/nvme/host/multipath.c | 10 - drivers/scsi/iscsi_tcp.c |4 fs/9p/vfs_file.c |2 fs/9p/vfs_super.c |4 fs/afs/super.c|1 fs/btrfs/disk-io.c|2 fs/fs-writeback.c |7 - fs/fuse/inode.c |4 fs/namei.c|4 fs/nfs/super.c|9 - fs/super.c|2 fs/ubifs/super.c |1 fs/vboxsf/super.c |1 include/linux/backing-dev.h | 78 +-- include/linux/blkdev.h|3 include/linux/drbd.h |1 include/linux/fs.h|2 mm/backing-dev.c | 12 - mm/filemap.c |4 mm/memcontrol.c |2 mm/memory-failure.c |2 mm/migrate.c |2 mm/mmap.c |2 mm/page-writeback.c | 18 +- mm/page_io.c | 18 +- mm/swapfile.c |4 48 files changed, 204 insertions(+), 464 deletions(-)