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 D2B8CC04A94 for ; Tue, 1 Aug 2023 09:50:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230329AbjHAJuv (ORCPT ); Tue, 1 Aug 2023 05:50:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233740AbjHAJud (ORCPT ); Tue, 1 Aug 2023 05:50:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E9F712A for ; Tue, 1 Aug 2023 02:50:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B9326614F3 for ; Tue, 1 Aug 2023 09:50:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB321C433C7; Tue, 1 Aug 2023 09:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1690883408; bh=eN3TeVouy+YgkIOcn66HdzCY3A/6qD8SxHfI+JlouEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xoLxEGsnJsI/edmeWMAKncUtYlO0rLOzdHn9/O7x422ENFWpZLMvrBcE/ZEzegzS1 7lcLXvJsrYOtFnCVD5VOS3uv7iPEA/nXcFlFUcsRQVRpyAmwAUHOSDV3M7svl8CM9U wjd2Zzr846wp+rjxKatBLJTy8C9Jhu/PZ7Bs1hvs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Schoenebeck , Dominique Martinet , Eric Van Hensbergen Subject: [PATCH 6.4 218/239] fs/9p: fix typo in comparison logic for cache mode Date: Tue, 1 Aug 2023 11:21:22 +0200 Message-ID: <20230801091933.781790093@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230801091925.659598007@linuxfoundation.org> References: <20230801091925.659598007@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Van Hensbergen commit 878cb3e0337d7c3096aee301a2a3cd358dc8aa81 upstream. There appears to be a typo in the comparison statement for the logic which sets a file's cache mode based on mount flags. Cc: stable@vger.kernel.org Fixes: 1543b4c5071c ("fs/9p: remove writeback fid and fix per-file modes") Reviewed-by: Christian Schoenebeck Reviewed-by: Dominique Martinet Signed-off-by: Eric Van Hensbergen Signed-off-by: Greg Kroah-Hartman --- fs/9p/fid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/9p/fid.h +++ b/fs/9p/fid.h @@ -57,7 +57,7 @@ static inline void v9fs_fid_add_modes(st (s_flags & V9FS_DIRECT_IO) || (f_flags & O_DIRECT)) { fid->mode |= P9L_DIRECT; /* no read or write cache */ } else if ((!(s_cache & CACHE_WRITEBACK)) || - (f_flags & O_DSYNC) | (s_flags & V9FS_SYNC)) { + (f_flags & O_DSYNC) || (s_flags & V9FS_SYNC)) { fid->mode |= P9L_NOWRITECACHE; } }