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 3404DC433F5 for ; Tue, 19 Apr 2022 18:24:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234035AbiDSS1S (ORCPT ); Tue, 19 Apr 2022 14:27:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357284AbiDSSXG (ORCPT ); Tue, 19 Apr 2022 14:23:06 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABF3E433B4; Tue, 19 Apr 2022 11:15:41 -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 566AFB81185; Tue, 19 Apr 2022 18:15:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 250D2C385AB; Tue, 19 Apr 2022 18:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650392139; bh=q+LJfLznKrQkXW0e24IKQ9gcKHtINcDcGkYCosa7MkM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mBeeJAMNh4j1M2yl16vTQVxhT8WVHPyXM2doCKi9DeZ1MbgGgA2r1gJdtBZ+f6fiJ MN8/5Ebw+T0SouUXuB72IbcdJDQsL5DFSpO18z6PpVCxeOVgQI0nxeiS8ukoUSsvFY v0LOpa30v3+0LH/cXOK8oEvwzkCO0jTRf5k50xzbpOf+0h4p7maXIsdqvo9J2rEjqF QOla9SWW7Se9JT4mGjwkSJZnlbEVP44bh5BEEVXlHfZK3jT3UKI+0gxTf3isBG/VFQ RUx9kAoMztV0+Sdg1DUnaDJXKGdG5eRKFizybdW6GJ0y6hAPYlVIKxCzewyGZxJRHj 57TBkAO+MiCjg== 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 4.19 06/12] cifs: Check the IOCB_DIRECT flag, not O_DIRECT Date: Tue, 19 Apr 2022 14:15:19 -0400 Message-Id: <20220419181525.486166-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419181525.486166-1-sashal@kernel.org> References: <20220419181525.486166-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 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