Unverified Commit 28906e0d authored Jan 08, 2025 by openeuler-ci-bot Committed by Gitee Jan 08, 2025

!14485 ocfs2: fix uninitialized value in ocfs2_file_read_iter()

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/37PKATNZNMJ5ZRAXYZ26NRCOZ2JKQSUB/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBDHGQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/14485

 

Reviewed-by: Yuan Can <yuancan@huawei.com>
Signed-off-by: Yuan Can <yuancan@huawei.com>

parents f67f570a df277b95

fs/ocfs2/aops.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,8 @@ enum ocfs2_iocb_lock_bits {
		OCFS2_IOCB_NUM_LOCKS
		};

		#define ocfs2_iocb_init_rw_locked(iocb) \
		(iocb->private = NULL)
		#define ocfs2_iocb_clear_rw_locked(iocb) \
		clear_bit(OCFS2_IOCB_RW_LOCK, (unsigned long *)&iocb->private)
		#define ocfs2_iocb_rw_locked_level(iocb) \

fs/ocfs2/file.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2400,6 +2400,8 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb,
		} else
		inode_lock(inode);

		ocfs2_iocb_init_rw_locked(iocb);

		/*
		* Concurrent O_DIRECT writes are allowed with
		* mount_option "coherency=buffered".
		@@ -2546,6 +2548,8 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb,
		if (!direct_io && nowait)
		return -EOPNOTSUPP;

		ocfs2_iocb_init_rw_locked(iocb);

		/*
		* buffered reads protect themselves in ->readpage(). O_DIRECT reads
		* need locks to protect pending reads from racing with truncate.