]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ext4: remove unused unwritten parameter in ext4_dio_write_iter()
authorZhang Yi <yi.zhang@huawei.com>
Mon, 5 Jan 2026 01:45:20 +0000 (09:45 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 20 Jan 2026 03:28:30 +0000 (22:28 -0500)
The parameter unwritten in ext4_dio_write_iter() is no longer needed,
simply remove it.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://patch.msgid.link/20260105014522.1937690-6-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/file.c

index 43a24c776bf05c0db79bb5f0e3c5f12173b6f519..5ef5a855ce9fd0f20386ef84eba1b2f2bee07fd6 100644 (file)
@@ -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 @@ restart:
 
        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 @@ restart:
         */
        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 @@ restart:
                        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;