linux-kernel - Re: linux-next: build failure after merge of the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20170710023416.GV10672@ZenIV.linux.org.uk>
Date:   Mon, 10 Jul 2017 03:34:16 +0100
From:   Al Viro <viro@...IV.linux.org.uk>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        David Howells <dhowells@...hat.com>,
        Jeremy Kerr <jk@...abs.org>,
        Linux PPC Development List <linuxppc-dev@...ts.ozlabs.org>
Subject: Re: linux-next: build failure after merge of the vfs tree

On Mon, Jul 10, 2017 at 12:15:11PM +1000, Stephen Rothwell wrote:
> Hi Al,

> Caused by commit
> 
>   4f9365d9e2e7 ("spufs: Implement show_options")

Obvious incremental follows, will fold and push

diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 27a51a60bc33..e210d69beeee 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -608,15 +608,16 @@ static const match_table_t spufs_tokens = {
 static int spufs_show_options(struct seq_file *m, struct dentry *root)
 {
 	struct spufs_sb_info *sbi = spufs_get_sb_info(root->d_sb);
+	struct inode *inode = root->d_inode;
 
-	if (!uid_eq(root->i_uid, GLOBAL_ROOT_UID))
+	if (!uid_eq(inode->i_uid, GLOBAL_ROOT_UID))
 		seq_printf(m, ",uid=%u",
-			   from_kuid_munged(&init_user_ns, root->i_uid));
-	if (!gid_eq(root->i_gid, GLOBAL_ROOT_GID))
+			   from_kuid_munged(&init_user_ns, inode->i_uid));
+	if (!gid_eq(inode->i_gid, GLOBAL_ROOT_GID))
 		seq_printf(m, ",gid=%u",
-			   from_kgid_munged(&init_user_ns, root->i_gid));
-	if (root->i_mode & S_IALLUGO != 0775)
-		seq_printf(m, ",mode=%o", root->i_mode);
+			   from_kgid_munged(&init_user_ns, inode->i_gid));
+	if (inode->i_mode & S_IALLUGO != 0775)
+		seq_printf(m, ",mode=%o", inode->i_mode);
 	if (sbi->debug)
 		seq_puts(m, ",debug");
 	return 0;