From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39F31C433EF for ; Tue, 19 Apr 2022 18:12:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356408AbiDSSO7 (ORCPT ); Tue, 19 Apr 2022 14:14:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356298AbiDSSOh (ORCPT ); Tue, 19 Apr 2022 14:14:37 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D63AB3DA44; Tue, 19 Apr 2022 11:11:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 42805B818EF; Tue, 19 Apr 2022 18:11:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5726C385A7; Tue, 19 Apr 2022 18:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650391906; bh=OMBDnPT/YNAX80BSRFRV5EnqpFIwotIZUg/vDTSC8qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dR1NH5B+H27VOIJTDXKUNlxQ0FR0wg7P3GIb4KDlD8W96HyDsKzKq9DS5oeheStyt xFcac4TtCa9/htDKFVbatPUHkPTvUcsf5GhF3ZoEHjxjX7mvt+Q/oPmzgGDjwCfieU eBpRmhEI5C4wRjRQe2g3Du6BnJCgJy5/BtayQRfE5WWeRsvNZXT58JrrqJprN40WpN 7soOER2+QNLeJNI5AY/Kbyx5zXKBka1CstIr8IK2MIcPdK0Ixnycjs29uA7R4gswA6 27aw016Ui9/4wI972zMageurDKC6kQrO7ItoaabK9Z8MLRNJROD3WmqYFfbg+dojMK NutEV9PmcG7WQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Howells , Steve French , Shyam Prasad N , Rohith Surabattula , linux-cifs@vger.kernel.org, Steve French , Sasha Levin , samba-technical@lists.samba.org Subject: [PATCH AUTOSEL 5.17 13/34] cifs: Check the IOCB_DIRECT flag, not O_DIRECT Date: Tue, 19 Apr 2022 14:10:40 -0400 Message-Id: <20220419181104.484667-13-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419181104.484667-1-sashal@kernel.org> References: <20220419181104.484667-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Howells [ 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 cc: Steve French cc: Shyam Prasad N cc: Rohith Surabattula cc: linux-cifs@vger.kernel.org Signed-off-by: Steve French Signed-off-by: Sasha Levin --- 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 6e5246122ee2..2942d0e622fa 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -944,7 +944,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