Merge branch 'rebased-statx' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-artful-kernel.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 2dae60075f6ef80412ae70a0561f0b88cde0b4ab..c87b6b9a8a76b0a11078a391b0f6e4772cd1941e 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1729,11 +1729,12 @@ out_unlock:
        return NULL;
 }
 
-int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+int pid_getattr(const struct path *path, struct kstat *stat,
+               u32 request_mask, unsigned int query_flags)
 {
-       struct inode *inode = d_inode(dentry);
+       struct inode *inode = d_inode(path->dentry);
        struct task_struct *task;
-       struct pid_namespace *pid = dentry->d_sb->s_fs_info;
+       struct pid_namespace *pid = path->dentry->d_sb->s_fs_info;
 
        generic_fillattr(inode, stat);
 
@@ -3516,9 +3517,10 @@ static int proc_task_readdir(struct file *file, struct dir_context *ctx)
        return 0;
 }
 
-static int proc_task_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+static int proc_task_getattr(const struct path *path, struct kstat *stat,
+                            u32 request_mask, unsigned int query_flags)
 {
-       struct inode *inode = d_inode(dentry);
+       struct inode *inode = d_inode(path->dentry);
        struct task_struct *p = get_proc_task(inode);
        generic_fillattr(inode, stat);