procfs: get rid of ->f_dentry
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 31 Oct 2014 04:42:35 +0000 (00:42 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 19 Nov 2014 18:01:24 +0000 (13:01 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/proc/base.c

index 772efa45a452c75a912ec67641d06bee4cfde4bf..64891f3e41bd0783646c596977bd282ba6d28bf2 100644 (file)
@@ -2789,7 +2789,7 @@ retry:
 int proc_pid_readdir(struct file *file, struct dir_context *ctx)
 {
        struct tgid_iter iter;
-       struct pid_namespace *ns = file->f_dentry->d_sb->s_fs_info;
+       struct pid_namespace *ns = file_inode(file)->i_sb->s_fs_info;
        loff_t pos = ctx->pos;
 
        if (pos >= PID_MAX_LIMIT + TGID_OFFSET)
@@ -3095,7 +3095,7 @@ static int proc_task_readdir(struct file *file, struct dir_context *ctx)
        /* f_version caches the tgid value that the last readdir call couldn't
         * return. lseek aka telldir automagically resets f_version to 0.
         */
-       ns = file->f_dentry->d_sb->s_fs_info;
+       ns = inode->i_sb->s_fs_info;
        tid = (int)file->f_version;
        file->f_version = 0;
        for (task = first_tid(proc_pid(inode), tid, ctx->pos - 2, ns);