Commit fa6c46e7 authored by David Howells's avatar David Howells Committed by Jens Axboe
Browse files

ext4: Provide a splice-read wrapper 



Provide a splice_read wrapper for Ext4.  This does the inode shutdown check
before proceeding.  Splicing from DAX files and O_DIRECT fds is handled by
the caller.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarTheodore Ts'o <tytso@mit.edu>
cc: Al Viro <viro@zeniv.linux.org.uk>
cc: Jens Axboe <axboe@kernel.dk>
cc: Andreas Dilger <adilger.kernel@dilger.ca>
cc: linux-ext4@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-block@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/20230522135018.2742245-19-dhowells@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 390df3b8

fs/ext4/file.c

+12 −1
Original line number Diff line number Diff line
@@ -147,6 +147,17 @@ static ssize_t ext4_file_read_iter(struct kiocb *iocb, struct iov_iter *to) 
	return generic_file_read_iter(iocb, to);

}



static ssize_t ext4_file_splice_read(struct file *in, loff_t *ppos,

				     struct pipe_inode_info *pipe,

				     size_t len, unsigned int flags)

{

	struct inode *inode = file_inode(in);



	if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))

		return -EIO;

	return generic_file_splice_read(in, ppos, pipe, len, flags);

}



/*

 * Called when an inode is released. Note that this is different

 * from ext4_file_open: open gets called at every open, but release
@@ -957,7 +968,7 @@ const struct file_operations ext4_file_operations = { 
	.release	= ext4_release_file,

	.fsync		= ext4_sync_file,

	.get_unmapped_area = thp_get_unmapped_area,

	.splice_read	= generic_file_splice_read,

	.splice_read	= ext4_file_splice_read,

	.splice_write	= iter_file_splice_write,

	.fallocate	= ext4_fallocate,

};