From: Tal Zussman Date: Mon, 25 May 2026 18:25:55 +0000 (-0400) Subject: block: remove blkdev_write_begin() and blkdev_write_end() X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ee9895ae5a1868b13effc28174e4bb7f1084ded6;p=thirdparty%2Flinux.git block: remove blkdev_write_begin() and blkdev_write_end() Remove blkdev_write_begin(), blkdev_write_end(), and their entries in def_blk_aops. These have been unreachable since commit 487c607df790 ("block: use iomap for writes to block devices") switched block device buffered writes from generic_perform_write() to iomap_file_buffered_write(), which bypasses aops->write_begin/end. Signed-off-by: Tal Zussman Reviewed-by: Christoph Hellwig Link: https://patch.msgid.link/20260525-blk-write-cleanup-v1-1-391c073e3831@columbia.edu Signed-off-by: Jens Axboe --- diff --git a/block/fops.c b/block/fops.c index bb6642b45937c..ffe7b2042f4e2 100644 --- a/block/fops.c +++ b/block/fops.c @@ -499,36 +499,12 @@ static void blkdev_readahead(struct readahead_control *rac) mpage_readahead(rac, blkdev_get_block); } -static int blkdev_write_begin(const struct kiocb *iocb, - struct address_space *mapping, loff_t pos, - unsigned len, struct folio **foliop, - void **fsdata) -{ - return block_write_begin(mapping, pos, len, foliop, blkdev_get_block); -} - -static int blkdev_write_end(const struct kiocb *iocb, - struct address_space *mapping, - loff_t pos, unsigned len, unsigned copied, - struct folio *folio, void *fsdata) -{ - int ret; - ret = block_write_end(pos, len, copied, folio); - - folio_unlock(folio); - folio_put(folio); - - return ret; -} - const struct address_space_operations def_blk_aops = { .dirty_folio = block_dirty_folio, .invalidate_folio = block_invalidate_folio, .read_folio = blkdev_read_folio, .readahead = blkdev_readahead, .writepages = blkdev_writepages, - .write_begin = blkdev_write_begin, - .write_end = blkdev_write_end, .migrate_folio = buffer_migrate_folio_norefs, .is_dirty_writeback = buffer_check_dirty_writeback, };