From patchwork Mon Jul 10 02:15:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 785999 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x5TNg2FPBz9s1h for ; Mon, 10 Jul 2017 12:16:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="fill06IX"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3x5TNg1Bb7zDqR9 for ; Mon, 10 Jul 2017 12:16:35 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="fill06IX"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3x5TM40XP0zDq66 for ; Mon, 10 Jul 2017 12:15:12 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="fill06IX"; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3x5TM3661Dz9s1h; Mon, 10 Jul 2017 12:15:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1499652911; bh=cc0ICNwlWSBBuiGKdeP/dudQPpEqQ00afHniq5YiSI0=; h=Date:From:To:Cc:Subject:From; b=fill06IXOmk31W1GZI/xqJHw5Xq2qKiTNnTsbKLzlgM++Q7OtxaZu6gYqsnqUCXTj cA3a9887RCDkzsMj0xaAC3C6lj6V1cmJbixfIEtiSZoSBAA58mO9neX1zIvsWG8/qa sSKREDl6aYHV7ecpiLQBtNWrvnd4vWcd5A/09uvhoXgD3wqIvaWMaSvMo3ZEgWOY2I 1ppNofSs1IdHB7BjEsIzwTYaKVc7+dtNXtOp8X4KM3/KpWOHJ1lGokWSwa641UcGSR pCpqZ+lxJMD0hSSIj4dxoXwVZM8EjhHjpFdY59ttecsdW0nv0WdPwbDqkzkjBGV6RU pXkoFYx6nCISA== Date: Mon, 10 Jul 2017 12:15:11 +1000 From: Stephen Rothwell To: Al Viro Subject: linux-next: build failure after merge of the vfs tree Message-ID: <20170710121511.1995914e@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Howells , Linux-Next Mailing List , Linux PPC Development List , Linux Kernel Mailing List , Jeremy Kerr Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi Al, After merging the vfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: arch/powerpc/platforms/cell/spufs/inode.c: In function 'spufs_show_options': arch/powerpc/platforms/cell/spufs/inode.c:612:18: error: 'struct dentry' has no member named 'i_uid' if (!uid_eq(root->i_uid, GLOBAL_ROOT_UID)) ^ arch/powerpc/platforms/cell/spufs/inode.c:614:43: error: 'struct dentry' has no member named 'i_uid' from_kuid_munged(&init_user_ns, root->i_uid)); ^ arch/powerpc/platforms/cell/spufs/inode.c:615:18: error: 'struct dentry' has no member named 'i_gid' if (!gid_eq(root->i_gid, GLOBAL_ROOT_GID)) ^ arch/powerpc/platforms/cell/spufs/inode.c:617:43: error: 'struct dentry' has no member named 'i_gid' from_kgid_munged(&init_user_ns, root->i_gid)); ^ arch/powerpc/platforms/cell/spufs/inode.c:618:10: error: 'struct dentry' has no member named 'i_mode' if (root->i_mode & S_IALLUGO != 0775) ^ arch/powerpc/platforms/cell/spufs/inode.c:619:33: error: 'struct dentry' has no member named 'i_mode' seq_printf(m, ",mode=%o", root->i_mode); ^ Caused by commit 4f9365d9e2e7 ("spufs: Implement show_options") A bit hard to revert this, so I added the below patch for now ... please fix it up. Also, isn't this a bit late for this merge window? From: Stephen Rothwell Date: Mon, 10 Jul 2017 11:05:31 +1000 Subject: [PATCH] disable the spufs show options for now Signed-off-by: Stephen Rothwell --- arch/powerpc/platforms/cell/spufs/inode.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index 27a51a60bc33..fafbf88326d8 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c @@ -609,6 +609,7 @@ static int spufs_show_options(struct seq_file *m, struct dentry *root) { struct spufs_sb_info *sbi = spufs_get_sb_info(root->d_sb); +#if 0 if (!uid_eq(root->i_uid, GLOBAL_ROOT_UID)) seq_printf(m, ",uid=%u", from_kuid_munged(&init_user_ns, root->i_uid)); @@ -617,6 +618,7 @@ static int spufs_show_options(struct seq_file *m, struct dentry *root) from_kgid_munged(&init_user_ns, root->i_gid)); if (root->i_mode & S_IALLUGO != 0775) seq_printf(m, ",mode=%o", root->i_mode); +#endif if (sbi->debug) seq_puts(m, ",debug"); return 0;