Commit 8bd1f257 authored by Zhang Yi's avatar Zhang Yi Committed by Theodore Ts'o
Browse files

ext4: remove unused unwritten parameter in ext4_dio_write_iter() 



The parameter unwritten in ext4_dio_write_iter() is no longer needed,
simply remove it.

Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarOjaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://patch.msgid.link/20260105014522.1937690-6-yi.zhang@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 012924f0

fs/ext4/file.c

+7 −7
Original line number Diff line number Diff line
@@ -424,14 +424,14 @@ static const struct iomap_dio_ops ext4_dio_write_ops = { 
 */

static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from,

				     bool *ilock_shared, bool *extend,

				     bool *unwritten, int *dio_flags)

				     int *dio_flags)

{

	struct file *file = iocb->ki_filp;

	struct inode *inode = file_inode(file);

	loff_t offset;

	size_t count;

	ssize_t ret;

	bool overwrite, unaligned_io;

	bool overwrite, unaligned_io, unwritten;



restart:

	ret = ext4_generic_write_checks(iocb, from);
@@ -443,7 +443,7 @@ static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from, 


	unaligned_io = ext4_unaligned_io(inode, from, offset);

	*extend = ext4_extending_io(inode, offset, count);

	overwrite = ext4_overwrite_io(inode, offset, count, unwritten);

	overwrite = ext4_overwrite_io(inode, offset, count, &unwritten);



	/*

	 * Determine whether we need to upgrade to an exclusive lock. This is
@@ -458,7 +458,7 @@ static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from, 
	 */

	if (*ilock_shared &&

	    ((!IS_NOSEC(inode) || *extend || !overwrite ||

	     (unaligned_io && *unwritten)))) {

	     (unaligned_io && unwritten)))) {

		if (iocb->ki_flags & IOCB_NOWAIT) {

			ret = -EAGAIN;

			goto out;
@@ -481,7 +481,7 @@ static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from, 
			ret = -EAGAIN;

			goto out;

		}

		if (unaligned_io && (!overwrite || *unwritten))

		if (unaligned_io && (!overwrite || unwritten))

			inode_dio_wait(inode);

		*dio_flags = IOMAP_DIO_FORCE_WAIT;

	}
@@ -506,7 +506,7 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	struct inode *inode = file_inode(iocb->ki_filp);

	loff_t offset = iocb->ki_pos;

	size_t count = iov_iter_count(from);

	bool extend = false, unwritten = false;

	bool extend = false;

	bool ilock_shared = true;

	int dio_flags = 0;
@@ -552,7 +552,7 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);



	ret = ext4_dio_write_checks(iocb, from, &ilock_shared, &extend,

				    &unwritten, &dio_flags);

				    &dio_flags);

	if (ret <= 0)

		return ret;