small blkdev_issue_flush cleanups
Subsystems (13)
Christoph Hellwig
maintainerHi Jens,
two small cleanups for blkdev_issue_flush below.
Christoph Hellwig
maintainerPATCH 1/2 block: remove the error_sector argument to blkdev_issue_flush
The argument isn't used by any caller, and drivers don't fill out bi_sector for flush requests either.
--- block/blk-flush.c | 17 ++--------------- drivers/md/dm-integrity.c | 2 +- drivers/md/dm-zoned-metadata.c | 6 +++--- drivers/md/raid5-ppl.c | 2 +- drivers/nvme/target/io-cmd-bdev.c | 2 +- fs/block_dev.c | 2 +- fs/ext4/fsync.c | 2 +- fs/ext4/ialloc.c | 2 +- fs/ext4/super.c | 2 +- fs/fat/file.c | 2 +- fs/hfsplus/inode.c | 2 +- fs/hfsplus/super.c | 2 +- fs/jbd2/checkpoint.c | 2 +- fs/jbd2/commit.c | 4 ++-- fs/jbd2/recovery.c | 2 +- fs/libfs.c | 2 +- fs/nilfs2/the_nilfs.h | 2 +- fs/ocfs2/file.c | 2 +- fs/reiserfs/file.c | 2 +- fs/xfs/xfs_super.c | 2 +- fs/zonefs/super.c | 2 +- include/linux/blkdev.h | 2 +- 22 files changed, 26 insertions(+), 39 deletions(-)
block/blk-flush.c +2 -15
@@ -433,15 +433,11 @@ void blk_insert_flush(struct request *rq)* blkdev_issue_flush - queue a flush * @bdev: blockdev to issue flush for * @gfp_mask: memory allocation flags (for bio_alloc) -* @error_sector: error sector * * Description: -* Issue a flush for the block device in question. Caller can supply -* room for storing the error offset in case of a flush error, if they -* wish to. +* Issue a flush for the block device in question. */ -int blkdev_issue_flush (struct block_device *bdev,gfp_t gfp_mask, -sector_t *error_sector) +int blkdev_issue_flush (struct block_device *bdev,gfp_t gfp_mask) {struct request_queue *q;struct bio *bio;
@@ -459,15 +455,6 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, bio->bi_opf =REQ_OP_WRITE |REQ_PREFLUSH ; ret =submit_bio_wait (bio); - -/* -* The driver must store the error location in ->bi_sector, if -* it supports it. For non-stacked drivers, this should be -* copied from blk_rq_pos(rq). -*/ -if (error_sector) - *error_sector = bio->bi_iter.bi_sector; -bio_put (bio);return ret; }
drivers/md/dm-integrity.c +1 -1
@@ -2657,7 +2657,7 @@ static void bitmap_flush_work(struct work_struct *work)dm_integrity_flush_buffers (ic);if (ic->meta_dev) -blkdev_issue_flush (ic->dev->bdev,GFP_NOIO ,NULL ); +blkdev_issue_flush (ic->dev->bdev,GFP_NOIO ); limit = ic->provided_data_sectors;if (ic->sb->flags &cpu_to_le32 (SB_FLAG_RECALCULATING )) {
drivers/md/dm-zoned-metadata.c +3 -3
@@ -661,7 +661,7 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set) ret =dmz_rdwr_block (zmd,REQ_OP_WRITE , block, mblk->page);if (ret ==0 ) - ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); + ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO );return ret; }
@@ -703,7 +703,7 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd,/* Flush drive cache (this will also sync data) */ if (ret ==0 ) - ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); + ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO );return ret; }
@@ -772,7 +772,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)/* If there are no dirty metadata blocks, just flush the device cache */ if (list_empty (&write_list)) { - ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); + ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ); goto err; }
drivers/md/raid5-ppl.c +1 -1
@@ -1037,7 +1037,7 @@ static int ppl_recover(struct ppl_log *log, struct ppl_header *pplhdr, }/* flush the disk cache after recovery if necessary */ - ret =blkdev_issue_flush (rdev->bdev,GFP_KERNEL ,NULL ); + ret =blkdev_issue_flush (rdev->bdev,GFP_KERNEL ); out:__free_page (page);return ret;
drivers/nvme/target/io-cmd-bdev.c +1 -1
@@ -226,7 +226,7 @@ static void nvmet_bdev_execute_flush(struct nvmet_req *req)u16 nvmet_bdev_flush (struct nvmet_req *req) { -if (blkdev_issue_flush (req->ns->bdev,GFP_KERNEL ,NULL )) +if (blkdev_issue_flush (req->ns->bdev,GFP_KERNEL ))return NVME_SC_INTERNAL |NVME_SC_DNR ;return 0 ; }
fs/block_dev.c +1 -1
@@ -672,7 +672,7 @@ int blkdev_fsync(struct file *filp, loff_t start, loff_t end, int datasync)* i_mutex and doing so causes performance issues with concurrent * O_SYNC writers to a block device. */ - error =blkdev_issue_flush (bdev,GFP_KERNEL ,NULL ); + error =blkdev_issue_flush (bdev,GFP_KERNEL );if (error == -EOPNOTSUPP ) error =0 ;
fs/ext4/fsync.c +1 -1
@@ -176,7 +176,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) ret =ext4_fsync_journal (inode, datasync, &needs_barrier);if (needs_barrier) { - err =blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ,NULL ); + err =blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL );if (!ret) ret = err; }
fs/ext4/ialloc.c +1 -1
@@ -1440,7 +1440,7 @@ int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,if (ret <0 ) goto err_out;if (barrier) -blkdev_issue_flush (sb->s_bdev,GFP_NOFS ,NULL ); +blkdev_issue_flush (sb->s_bdev,GFP_NOFS ); skip_zeroout:ext4_lock_group (sb, group);
fs/ext4/super.c +1 -1
@@ -5256,7 +5256,7 @@ static int ext4_sync_fs(struct super_block *sb, int wait) needs_barrier = true;if (needs_barrier) {int err; - err =blkdev_issue_flush (sb->s_bdev,GFP_KERNEL ,NULL ); + err =blkdev_issue_flush (sb->s_bdev,GFP_KERNEL );if (!ret) ret = err; }
fs/fat/file.c +1 -1
@@ -195,7 +195,7 @@ int fat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync)if (err)return err; -return blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ,NULL ); +return blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ); }
fs/hfsplus/inode.c +1 -1
@@ -340,7 +340,7 @@ int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end, }if (!test_bit (HFSPLUS_SB_NOBARRIER , &sbi->flags)) -blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ,NULL ); +blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL );inode_unlock (inode);
fs/hfsplus/super.c +1 -1
@@ -239,7 +239,7 @@ static int hfsplus_sync_fs(struct super_block *sb, int wait)mutex_unlock (&sbi->vh_mutex);if (!test_bit (HFSPLUS_SB_NOBARRIER , &sbi->flags)) -blkdev_issue_flush (sb->s_bdev,GFP_KERNEL ,NULL ); +blkdev_issue_flush (sb->s_bdev,GFP_KERNEL );return error; }
fs/jbd2/checkpoint.c +1 -1
@@ -414,7 +414,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)* jbd2_cleanup_journal_tail() doesn't get called all that often. */ if (journal->j_flags &JBD2_BARRIER ) -blkdev_issue_flush (journal->j_fs_dev,GFP_NOFS ,NULL ); +blkdev_issue_flush (journal->j_fs_dev,GFP_NOFS );return __jbd2_update_log_tail (journal, first_tid, blocknr); }
fs/jbd2/commit.c +2 -2
@@ -775,7 +775,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)if (commit_transaction->t_need_data_flush && (journal->j_fs_dev != journal->j_dev) && (journal->j_flags &JBD2_BARRIER )) -blkdev_issue_flush (journal->j_fs_dev,GFP_NOFS ,NULL ); +blkdev_issue_flush (journal->j_fs_dev,GFP_NOFS );/* Done it all: now write the commit record asynchronously. */ if (jbd2_has_feature_async_commit (journal)) {
@@ -882,7 +882,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) stats.run.rs_blocks_logged++;if (jbd2_has_feature_async_commit (journal) && journal->j_flags &JBD2_BARRIER ) { -blkdev_issue_flush (journal->j_dev,GFP_NOFS ,NULL ); +blkdev_issue_flush (journal->j_dev,GFP_NOFS ); }if (err)
fs/jbd2/recovery.c +1 -1
@@ -286,7 +286,7 @@ int jbd2_journal_recover(journal_t *journal) err = err2;/* Make sure all replayed data is on permanent storage */ if (journal->j_flags &JBD2_BARRIER ) { - err2 =blkdev_issue_flush (journal->j_fs_dev,GFP_KERNEL ,NULL ); + err2 =blkdev_issue_flush (journal->j_fs_dev,GFP_KERNEL );if (!err) err = err2; }
fs/libfs.c +1 -1
@@ -1113,7 +1113,7 @@ int generic_file_fsync(struct file *file, loff_t start, loff_t end, err =__generic_file_fsync (file, start, end, datasync);if (err)return err; -return blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ,NULL ); +return blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ); }EXPORT_SYMBOL (generic_file_fsync);
fs/nilfs2/the_nilfs.h +1 -1
@@ -375,7 +375,7 @@ static inline int nilfs_flush_device(struct the_nilfs *nilfs)*/ smp_wmb (); - err =blkdev_issue_flush (nilfs->ns_bdev,GFP_KERNEL ,NULL ); + err =blkdev_issue_flush (nilfs->ns_bdev,GFP_KERNEL );if (err != -EIO ) err =0 ;return err;
fs/ocfs2/file.c +1 -1
@@ -194,7 +194,7 @@ static int ocfs2_sync_file(struct file *file, loff_t start, loff_t end, needs_barrier = true; err =jbd2_complete_transaction (journal, commit_tid);if (needs_barrier) { - ret =blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ,NULL ); + ret =blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL );if (!err) err = ret; }
fs/reiserfs/file.c +1 -1
@@ -159,7 +159,7 @@ static int reiserfs_sync_file(struct file *filp, loff_t start, loff_t end, barrier_done =reiserfs_commit_for_inode (inode);reiserfs_write_unlock (inode->i_sb);if (barrier_done !=1 &&reiserfs_barrier_flush (inode->i_sb)) -blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ,NULL ); +blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL );inode_unlock (inode);if (barrier_done <0 )return barrier_done;
fs/xfs/xfs_super.c +1 -1
@@ -305,7 +305,7 @@ voidxfs_blkdev_issue_flush ( xfs_buftarg_t *buftarg) { -blkdev_issue_flush (buftarg->bt_bdev,GFP_NOFS ,NULL ); +blkdev_issue_flush (buftarg->bt_bdev,GFP_NOFS ); }STATIC void
fs/zonefs/super.c +1 -1
@@ -479,7 +479,7 @@ static int zonefs_file_fsync(struct file *file, loff_t start, loff_t end,if (ZONEFS_I (inode)->i_ztype ==ZONEFS_ZTYPE_CNV ) ret =file_write_and_wait_range (file, start, end);if (!ret) - ret =blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ,NULL ); + ret =blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL );if (ret)zonefs_io_error (inode, true);
include/linux/blkdev.h +1 -1
@@ -1221,7 +1221,7 @@ static inline bool blk_needs_flush_plug(struct task_struct *tsk) !list_empty(&plug->cb_list)); } -extern int blkdev_issue_flush (struct block_device *,gfp_t ,sector_t *); +int blkdev_issue_flush (struct block_device *,gfp_t );extern int blkdev_issue_write_same (struct block_device *bdev,sector_t sector,sector_t nr_sects,gfp_t gfp_mask,struct page *page);
Signature · 1 line
2.26.2
Re: [PATCH 1/2] block: remove the error_sector argument to blkdev_issue_flush
Quoted 4 lines · Christoph Hellwig
The argument isn't used by any caller, and drivers don't fill out
bi_sectorfor flush requests either.Signed-off-by Christoph Hellwig<[email protected]>
Looks good.
Christoph Hellwig
maintainerPATCH 2/2 block: remove the disk and queue NULL checks in blkdev_issue_flush
In reply to Christoph HellwigBoth of these never can be NULL for a live block device.
--- block/blk-flush.c | 8 -------- 1 file changed, 8 deletions(-)
block/blk-flush.c +0 -8
@@ -439,17 +439,9 @@ void blk_insert_flush(struct request *rq)*/ int blkdev_issue_flush (struct block_device *bdev,gfp_t gfp_mask) { -struct request_queue *q;struct bio *bio;int ret =0 ; -if (bdev->bd_disk ==NULL ) -return -ENXIO ; - - q =bdev_get_queue (bdev); -if (!q) -return -ENXIO ; - bio =bio_alloc (gfp_mask,0 );bio_set_dev (bio, bdev); bio->bi_opf =REQ_OP_WRITE |REQ_PREFLUSH ;
Signature · 1 line
2.26.2
Re: [PATCH 2/2] block: remove the disk and queue NULL checks in blkdev_issue_flush
Quoted 3 lines · Christoph Hellwig
Both of these never can be NULL for a live block device.
Signed-off-by Christoph Hellwig<[email protected]>
Looks good.
Jens Axboe
maintainerQuoted 3 lines · Christoph Hellwig
Hi Jens,
two small cleanups for
blkdev_issue_flushbelow.
Looks fine to me, but I hate patches that touch so wide in the tree, often ends up being a hassle for me. This one looks pretty low risk in that regard, hopefully it will be. Added for 5.8.
Signature · 1 line
Jens Axboe