diff mbox series

[4.9,12/24] cifs: Check the IOCB_DIRECT flag, not O_DIRECT

Message ID	20220426081731.735802262@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, David Howells <dhowells@redhat.com>, Steve French <sfrench@samba.org>, Shyam Prasad N <nspmangalore@gmail.com>, Rohith Surabattula <rohiths.msft@gmail.com>, linux-cifs@vger.kernel.org, Steve French <stfrench@microsoft.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.9 12/24] cifs: Check the IOCB_DIRECT flag, not O_DIRECT Date: Tue, 26 Apr 2022 10:21:06 +0200 Message-Id: <20220426081731.735802262@linuxfoundation.org> In-Reply-To: <20220426081731.370823950@linuxfoundation.org> References: <20220426081731.370823950@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.9,02/24] mm: page_alloc: fix building error on -Werror=array-compare [4.9,03/24] gfs2: assign rgrp glock before compute_bitstructs [4.9,04/24] ALSA: usb-audio: Clear MIDI port active flag after draining [4.9,05/24] dmaengine: imx-sdma: Fix error checking in sdma_event_remap [4.9,06/24] net/packet: fix packet_sock xmit return value checking [4.9,07/24] netlink: reset network and mac headers in netlink_dump() [4.9,08/24] ARM: vexpress/spc: Avoid negative array index when !SMP [4.9,09/24] platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative [4.9,10/24] ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant [4.9,11/24] vxlan: fix error return code in vxlan_fdb_append [4.9,12/24] cifs: Check the IOCB_DIRECT flag, not O_DIRECT [4.9,13/24] brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant [4.9,14/24] drm/msm/mdp5: check the return of kzalloc() [4.9,15/24] ata: pata_marvell: Check the bmdma_addr beforing reading [4.9,16/24] dma: at_xdmac: fix a missing check on list iterator [4.9,17/24] openvswitch: fix OOB access in reserve_sfa_size() [4.9,18/24] ASoC: soc-dapm: fix two incorrect uses of list iterator [4.9,19/24] e1000e: Fix possible overflow in LTR decoding [4.9,20/24] ARC: entry: fix syscall_trace_exit argument [4.9,21/24] ext4: limit length to bitmap_maxbytes - blocksize in punch_hole [4.9,22/24] ext4: fix overhead calculation to account for the reserved gdt blocks [4.9,23/24] ext4: force overhead calculation if the s_overhead_cluster makes no sense [4.9,24/24] block/compat_ioctl: fix range check in BLKGETSIZE

Commit Message

gregkh@linuxfoundation.org April 26, 2022, 8:21 a.m. UTC

From: David Howells <dhowells@redhat.com>

[ Upstream commit 994fd530a512597ffcd713b0f6d5bc916c5698f0 ]

Use the IOCB_DIRECT indicator flag on the I/O context rather than checking to
see if the file was opened O_DIRECT.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Steve French <sfrench@samba.org>
cc: Shyam Prasad N <nspmangalore@gmail.com>
cc: Rohith Surabattula <rohiths.msft@gmail.com>
cc: linux-cifs@vger.kernel.org
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/cifs/cifsfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 95e4f074b766..b85c283ad08b 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -766,7 +766,7 @@  cifs_loose_read_iter(struct kiocb *iocb, struct iov_iter *iter)
 	ssize_t rc;
 	struct inode *inode = file_inode(iocb->ki_filp);
 
-	if (iocb->ki_filp->f_flags & O_DIRECT)
+	if (iocb->ki_flags & IOCB_DIRECT)
 		return cifs_user_readv(iocb, iter);
 
 	rc = cifs_revalidate_mapping(inode);