From patchwork Wed Aug 14 11:40:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Mikhalitsyn X-Patchwork-Id: 13763397 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E684E1B86D0 for ; Wed, 14 Aug 2024 11:41:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723635700; cv=none; b=qDMfbXh0CGMjb0r2ReeZ+KbcpgHqD+8t/uE4s6nMZaccFSFCABs5UWBSan+mOnioefsYsag4B3sGy9Z7axbqyB9tdFgF3L8JwNjBoi0GN1EGae+Grdl4pKGSytDIRBrGqCD64yfzP3SfkX+7sdwbcpE/5RafM9FrFB4qvvG5yZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723635700; c=relaxed/simple; bh=4adc61tKzjK2fTdo7B9pTquQAHQKVd/XEnUnW9CoK7g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pVpH1AkH8PrQW3jm7g+80yDlobJqd6NL/o2Q4L+97TbW1eSLI+ZDgUCBRAm3Ny4d4kWATFyAAe8z4s1FemmXxUnsSrz3ds/eXEcdTm9d3Ag084dtSSVAVz7rY4PAXSR+I6YV+Yoiy+1YUUuSHuAIH3NowSb3gzjvLWixKYQokMo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=anhspGiT; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="anhspGiT" Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id C291B3F670 for ; Wed, 14 Aug 2024 11:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1723635697; bh=ftHOv+os2MH3Qk9OKnsGMHrGZxHBoFg3umKFJ4e1joU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=anhspGiTCGzdMTo/vaun3DzQpCpPvdq4ZQddlSqroyh76F4yoPsaYky8lxSLhbmld DdHcqdvCtjO9MXtKtJzM1IwgH0CIqYhGY/UwxTet1o2JlIldVZ3hKrbawwEydrAJID N49fb4BLpGxk5zpQkq4L16/mknLgAJVhV8ljenGEhu9c3K4xQTRi6O0Uzt9TIzLTqZ t8kjor2PCbyDyE5J8MEnpbpdRAL1NWgQFNIWplPfCU0qFqo3KHzUuMBOPpBQowJ8Uc RXFE7slJiWSt0YVvH5Vyb0plyXuDs/f1JX6030HjMrqL8S7EBpcDmJyKJsZGGv6qpv MTWd3fGmz4BaQ== Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a7aa26f342cso498671366b.1 for ; Wed, 14 Aug 2024 04:41:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723635697; x=1724240497; 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=ftHOv+os2MH3Qk9OKnsGMHrGZxHBoFg3umKFJ4e1joU=; b=MNkB3Ubf84WXWlVY02fMd/kDN4vDEy0pmnniIfWDOugLZGIMPfwq+WRN5rRG5wvbB0 qHwo+zr0KPjnm/z3z52rX/W8mudTcTeWQOKhAHjrdP9Wi7rBA+eTb7lG9rq0N4tCoksd msrOJACRJC990jqmrmtlA43GJd2Ga4EXAsD1hpElJ4mpbYYWaNRoB4x5fwhmq2tcOzTd Y37SZHYEzY6n3bn5HrkHuJFw14bfzX+aFgNpWMdPpOy3j9HUWdrzkOhu9RBHZrYl+UQx gagCEUO1R2d1I8+UncrPq1ag1Ec7ZwX7vdifzwBH3icuHcjPH0V4EashVR/RYa0EO5Qi IqTQ== X-Forwarded-Encrypted: i=1; AJvYcCXyf3nQX3z20SrcPkleHO0Un1a2XK61r5ZUte4y6bz/PRK1AyJLJwD9I6JNSsXxVykgM0BUX9M8j4evJMqQxpL6Gy/1h/4bCtkIHJfT6Q== X-Gm-Message-State: AOJu0YzoQv709OIIVCcfs2LRwJf3pYUPau1Xx5+tebnZnjSjiYbprVk5 O2pYRcp+REFcYvR/xvGFfWHcgww1IzpvEcecaQiUto06XgT1Ie9QhbhmxBalhS9PTYC3aQ+WjeZ l0onHGBdlLxkB6sDJLG82AeKD1gONWgRnEAi4U98zTrPqY9DJG9SiCg3xQsZbZtqsaA1rXZIXG7 nPj5g= X-Received: by 2002:a17:907:60d6:b0:a7d:a178:cd35 with SMTP id a640c23a62f3a-a83670bd5b2mr177717166b.64.1723635697357; Wed, 14 Aug 2024 04:41:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmjKqsGrx0ul0wb1XIoGECqCVrDs1V6uhHyqPC1//LdYgqMr4vyNwmguX/RN/gAEhqphkSRw== X-Received: by 2002:a17:907:60d6:b0:a7d:a178:cd35 with SMTP id a640c23a62f3a-a83670bd5b2mr177715066b.64.1723635696887; Wed, 14 Aug 2024 04:41:36 -0700 (PDT) Received: from amikhalitsyn.. ([188.192.113.77]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f3fa782csm162586166b.60.2024.08.14.04.41.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 04:41:36 -0700 (PDT) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Seth Forshee , Miklos Szeredi , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v2 6/9] fs/fuse: drop idmap argument from __fuse_get_acl Date: Wed, 14 Aug 2024 13:40:31 +0200 Message-Id: <20240814114034.113953-7-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240814114034.113953-1-aleksandr.mikhalitsyn@canonical.com> References: <20240814114034.113953-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We don't need to have idmap in the __fuse_get_acl as we don't have any use for it. In the current POSIX ACL implementation, idmapped mounts are taken into account on the userspace/kernel border (see vfs_set_acl_idmapped_mnt() and vfs_posix_acl_to_xattr()). Cc: Christian Brauner Cc: Seth Forshee Cc: Miklos Szeredi Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn Reviewed-by: Christian Brauner --- fs/fuse/acl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/fuse/acl.c b/fs/fuse/acl.c index 04cfd8fee992..897d813c5e92 100644 --- a/fs/fuse/acl.c +++ b/fs/fuse/acl.c @@ -12,7 +12,6 @@ #include static struct posix_acl *__fuse_get_acl(struct fuse_conn *fc, - struct mnt_idmap *idmap, struct inode *inode, int type, bool rcu) { int size; @@ -74,7 +73,7 @@ struct posix_acl *fuse_get_acl(struct mnt_idmap *idmap, if (fuse_no_acl(fc, inode)) return ERR_PTR(-EOPNOTSUPP); - return __fuse_get_acl(fc, idmap, inode, type, false); + return __fuse_get_acl(fc, inode, type, false); } struct posix_acl *fuse_get_inode_acl(struct inode *inode, int type, bool rcu) @@ -90,8 +89,7 @@ struct posix_acl *fuse_get_inode_acl(struct inode *inode, int type, bool rcu) */ if (!fc->posix_acl) return NULL; - - return __fuse_get_acl(fc, &nop_mnt_idmap, inode, type, rcu); + return __fuse_get_acl(fc, inode, type, rcu); } int fuse_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,