fs: port ->getattr() to pass mnt_idmap

[linux-block.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 92166c33395db093123cd52a0ae13add8100d148..aa7ebee0074678249f3e76630d4a2cf0b47fa272 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1959,14 +1959,14 @@ static struct inode *proc_pid_make_base_inode(struct super_block *sb,
        return inode;
 }
 
-int pid_getattr(struct user_namespace *mnt_userns, const struct path *path,
+int pid_getattr(struct mnt_idmap *idmap, const struct path *path,
                struct kstat *stat, u32 request_mask, unsigned int query_flags)
 {
        struct inode *inode = d_inode(path->dentry);
        struct proc_fs_info *fs_info = proc_sb_info(inode->i_sb);
        struct task_struct *task;
 
-       generic_fillattr(&init_user_ns, inode, stat);
+       generic_fillattr(&nop_mnt_idmap, inode, stat);
 
        stat->uid = GLOBAL_ROOT_UID;
        stat->gid = GLOBAL_ROOT_GID;
@@ -3891,13 +3891,13 @@ static int proc_task_readdir(struct file *file, struct dir_context *ctx)
        return 0;
 }
 
-static int proc_task_getattr(struct user_namespace *mnt_userns,
+static int proc_task_getattr(struct mnt_idmap *idmap,
                             const struct path *path, struct kstat *stat,
                             u32 request_mask, unsigned int query_flags)
 {
        struct inode *inode = d_inode(path->dentry);
        struct task_struct *p = get_proc_task(inode);
-       generic_fillattr(&init_user_ns, inode, stat);
+       generic_fillattr(&nop_mnt_idmap, inode, stat);
 
        if (p) {
                stat->nlink += get_nr_threads(p);