Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

[linux.git] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 205c92280838936d6402fa42792177748fd79ad8..554ecc54799fff058067c19d2261d56bbc6391d7 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -108,8 +108,8 @@ static int proc_show_options(struct seq_file *seq, struct dentry *root)
        struct super_block *sb = root->d_sb;
        struct pid_namespace *pid = sb->s_fs_info;
 
-       if (pid->pid_gid)
-               seq_printf(seq, ",gid=%lu", (unsigned long)pid->pid_gid);
+       if (!gid_eq(pid->pid_gid, GLOBAL_ROOT_GID))
+               seq_printf(seq, ",gid=%u", from_kgid_munged(&init_user_ns, pid->pid_gid));
        if (pid->hide_pid != 0)
                seq_printf(seq, ",hidepid=%u", pid->hide_pid);