From nobody Thu Dec 18 15:24:32 2025 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 35AC8CDB47E for ; Wed, 18 Oct 2023 11:15:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229933AbjJRLPe (ORCPT ); Wed, 18 Oct 2023 07:15:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230159AbjJRLPb (ORCPT ); Wed, 18 Oct 2023 07:15:31 -0400 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAE2811A; Wed, 18 Oct 2023 04:15:28 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-31c5cac3ae2so5783122f8f.3; Wed, 18 Oct 2023 04:15:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697627727; x=1698232527; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fMGHA1GqTA4NgUc9TGEceruFzKyhKbdLHyqCm7/lENQ=; b=c/FERCEXY3H+ereO2ZhahUZFv551Fg0BlePXzPHA6ERKa84nyPo+ZlPX/wBFtNfMXI XCPJjOHLIYxwtlIda9sKWXsudPlZ25LG3b2YL4uMnpHzd5y+jtN5+6hvikgw6uWAqtUl BoLswV3DYloSkrUrQO44ZSYpSUPUiPvtge8/2UuEG8u1A3+1MfLNhGr0JdgthxkndWnH 7hJ6fuCsCvLiZ6p23R2MRB5IM4TxY2wzoHLczwVelwXFzr3/UW5oO3i+kyb47Q8LR+1O sG9JC4mzVMPAxJOy36ZDijZaSWQ5sOVgvObrCaKQahaL36ehX27RTnZBWp3dS7NzQhyk Z8xA== X-Gm-Message-State: AOJu0Yw7xBjHDGuRDVTCotxPlPcu3pZ+2AJ+o2tWaxhuoW1naCf6gQXD ZJYQGdl8RHiGN9UZegbx1oEOjgJjUZJPFSmo X-Google-Smtp-Source: AGHT+IEah1o37/XzeYly4CKX7YUd53M7DtYsKbFDQmUnaElJZgAAwHMCs07P6qGmetQDsrpsSs4ERA== X-Received: by 2002:a5d:6046:0:b0:32d:a54a:f57c with SMTP id j6-20020a5d6046000000b0032da54af57cmr3949004wrt.25.1697627727199; Wed, 18 Oct 2023 04:15:27 -0700 (PDT) Received: from salami.lan ([80.111.64.44]) by smtp.gmail.com with ESMTPSA id l16-20020adfe590000000b0032da46648dasm1902344wrm.8.2023.10.18.04.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 04:15:26 -0700 (PDT) From: =?UTF-8?q?Andr=C3=A9=20Draszik?= To: linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Andr=C3=A9=20Draszik?= , Bernd Schubert , Miklos Szeredi , stable@vger.kernel.org, Greg Kroah-Hartman Subject: [PATCH v2] Revert "fuse: Apply flags2 only when userspace set the FUSE_INIT_EXT" Date: Wed, 18 Oct 2023 12:15:08 +0100 Message-Id: <20231018111508.3913860-1-git@andred.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230904133321.104584-1-git@andred.net> References: <20230904133321.104584-1-git@andred.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andr=C3=A9 Draszik This reverts commit 3066ff93476c35679cb07a97cce37d9bb07632ff. This patch breaks all existing userspace by requiring updates as mentioned in the commit message, which is not allowed. Revert to restore compatibility with existing userspace implementations. Cc: Bernd Schubert Cc: Miklos Szeredi Cc: Signed-off-by: Andr=C3=A9 Draszik Acked-by: Greg Kroah-Hartman --- v2: ping & add ack v1: resend because of missing people in Cc --- fs/fuse/inode.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 2e4eb7cf26fb..b21ccc85c47b 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1154,10 +1154,7 @@ static void process_init_reply(struct fuse_mount *fm= , struct fuse_args *args, process_init_limits(fc, arg); =20 if (arg->minor >=3D 6) { - u64 flags =3D arg->flags; - - if (flags & FUSE_INIT_EXT) - flags |=3D (u64) arg->flags2 << 32; + u64 flags =3D arg->flags | (u64) arg->flags2 << 32; =20 ra_pages =3D arg->max_readahead / PAGE_SIZE; if (flags & FUSE_ASYNC_READ) --=20 2.40.1