1 files changed, 3 insertions, 3 deletions

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 205c9228083..7ac817b64a7 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -33,7 +33,7 @@ static void proc_evict_inode(struct inode *inode)
         const struct proc_ns_operations *ns_ops;
 
         truncate_inode_pages(&inode->i_data, 0);
-        end_writeback(inode);
+        clear_inode(inode);
 
         /* Stop tracking associated processes */
         put_pid(PROC_I(inode)->pid);
@@ -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);