From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: 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>,
samba-technical@lists.samba.org
Subject: [PATCH AUTOSEL 4.19 06/12] cifs: Check the IOCB_DIRECT flag, not O_DIRECT
Date: Tue, 19 Apr 2022 14:15:19 -0400 [thread overview]
Message-ID: <20220419181525.486166-6-sashal@kernel.org> (raw)
In-Reply-To: <20220419181525.486166-1-sashal@kernel.org>
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 --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index baa1713d6695..52b1524b40cd 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -813,7 +813,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);
--
2.35.1
next prev parent reply other threads:[~2022-04-19 18:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 18:15 [PATCH AUTOSEL 4.19 01/12] ARM: vexpress/spc: Avoid negative array index when !SMP Sasha Levin
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 02/12] reset: tegra-bpmp: Restore Handle errors in BPMP response Sasha Levin
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 03/12] platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative Sasha Levin
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 04/12] ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant Sasha Levin
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 05/12] vxlan: fix error return code in vxlan_fdb_append Sasha Levin
2022-04-19 18:15 ` Sasha Levin [this message]
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 07/12] mt76: Fix undefined behavior due to shift overflowing the constant Sasha Levin
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 08/12] brcmfmac: sdio: " Sasha Levin
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 09/12] dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info() Sasha Levin
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 10/12] drm/msm/mdp5: check the return of kzalloc() Sasha Levin
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 11/12] net: macb: Restart tx only if queue pointer is lagging Sasha Levin
2022-04-19 18:15 ` [PATCH AUTOSEL 4.19 12/12] stat: fix inconsistency between struct stat and struct compat_stat Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220419181525.486166-6-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=dhowells@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nspmangalore@gmail.com \
--cc=rohiths.msft@gmail.com \
--cc=samba-technical@lists.samba.org \
--cc=sfrench@samba.org \
--cc=stable@vger.kernel.org \
--cc=stfrench@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).