Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[sfrench/cifs-2.6.git] / fs / fuse / dir.c
index e816166ce42fa9778d04224461716e5a83feadbc..00800c07ba1c89bda7abd8f15aa760b9ddccc869 100644 (file)
@@ -1777,10 +1777,10 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
        return ret;
 }
 
-static int fuse_getattr(struct vfsmount *mnt, struct dentry *entry,
-                       struct kstat *stat)
+static int fuse_getattr(const struct path *path, struct kstat *stat,
+                       u32 request_mask, unsigned int flags)
 {
-       struct inode *inode = d_inode(entry);
+       struct inode *inode = d_inode(path->dentry);
        struct fuse_conn *fc = get_fuse_conn(inode);
 
        if (!fuse_allow_current_process(fc))