From patchwork Fri Sep 13 03:32:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13802961 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 8D5F71FBA; Fri, 13 Sep 2024 03:32:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726198368; cv=none; b=PX2PDuHhdmWIsNj63PPdnWbi5Wreq2qVztSaVNnTG5MiRK9x+2/BvJ1v7Mt2UlqWxU+68/9tLPjeXSWm/xqsQTe2dQ3VCAYzDhpb+18O9n6PhGYfF4OTlGp9LdTLEIf214nZ0hY2oob8vjABiCJhDr+jYSsMU0azyuDMmlvsP00= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726198368; c=relaxed/simple; bh=5dswRtaI/cekzP52OoQleybfqeZaDsEgMK2pzxPaJWo=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=a5oWuj7WhPcrB6Uzkb/p/Gjmp1mPVDqLBYBNiWI6sccrj/uEk1a4kEw/Ydk8zwgZ+k4mH89l7W+x4aF9Mp20aZNBzlCpV6fF3/WD/UYmWjsdv+72axHOAJNFHARQinig0EBXN1Oeyq09sCUsLHuir7W/VbuqyIDpkvLufiswe08= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=gu+bYdFF; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="gu+bYdFF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1726198362; bh=cRIdHbf/TesTZNAEoHkiUXJnt7mDLW4aOPV/tSvre20=; h=Date:From:To:Cc:Subject:From; b=gu+bYdFFk+bkAfHJir3vqwmYlvUQRLWMxDW09zx0KrSKpSGpcZzEDcnM5uX/q+zxF PdXv7NzGbJQToBv07yCRRtn0Lf7e3Jmk7JXGMvbWa6NLqlnENO71HcE5ouj1eUmfSx TLQm9H7AMDmYLTVXa4OnBadBR3yP0oEyTNmjsxU2YUI56KdZTRtkxb+mFQCSnWmsTU NwXpaLpO/l2z69FQXF0b7Ah37xTe+mt+L5E9q5ljN/ngVxP8uNp4o3cEGKz3Kr/ky8 cgnQk0Vyq7c5Aqs5ZoCWuH7iSr0nLNYQe4cJFDa+noKWMKfTYtgFeiArK84WzJczPQ iEy1inLYUZihg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4X4fyK5y72z4wcL; Fri, 13 Sep 2024 13:32:41 +1000 (AEST) Date: Fri, 13 Sep 2024 13:32:40 +1000 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , Christian Brauner Cc: Al Viro , bpf , Networking , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the bpf-next tree Message-ID: <20240913133240.066ae790@canb.auug.org.au> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, After merging the bpf-next tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/namespace.c: In function 'grab_requested_mnt_ns': fs/namespace.c:5299:23: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file' 5299 | if (!f.file) | ^ fs/namespace.c:5302:36: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file' 5302 | if (!proc_ns_file(f.file)) | ^ In file included from fs/namespace.c:25: fs/namespace.c:5305:46: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file' 5305 | ns = get_proc_ns(file_inode(f.file)); | ^ include/linux/proc_ns.h:75:50: note: in definition of macro 'get_proc_ns' 75 | #define get_proc_ns(inode) ((struct ns_common *)(inode)->i_private) | ^~~~~ Caused by commit 1da91ea87aef ("introduce fd_file(), convert all accessors to it.") interacting with commit 7b9d14af8777 ("fs: allow mount namespace fd") diff --git a/fs/namespace.c b/fs/namespace.c index 8e88938d3f19..cad6dd5db2da 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -5296,13 +5296,13 @@ static struct mnt_namespace *grab_requested_mnt_ns(const struct mnt_id_req *kreq struct ns_common *ns; CLASS(fd, f)(kreq->spare); - if (!f.file) + if (!fd_file(f)) return ERR_PTR(-EBADF); - if (!proc_ns_file(f.file)) + if (!proc_ns_file(fd_file(f))) return ERR_PTR(-EINVAL); - ns = get_proc_ns(file_inode(f.file)); + ns = get_proc_ns(file_inode(fd_file(f))); if (ns->ops->type != CLONE_NEWNS) return ERR_PTR(-EINVAL);