Merge branch 'dm-4.12' into dm-4.12-post-merge

[karo-tx-linux.git] / fs / ceph / inode.c

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index fd8f771f99b7d7c0943170df1003a1c78e423af0..d449e1c03cbd791922148ad00c3d6d0f0e1599ce 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -2187,10 +2187,10 @@ int ceph_permission(struct inode *inode, int mask)
  * Get all attributes.  Hopefully somedata we'll have a statlite()
  * and can limit the fields we require to be accurate.
  */
-int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,
-                struct kstat *stat)
+int ceph_getattr(const struct path *path, struct kstat *stat,
+                u32 request_mask, unsigned int flags)
 {
-       struct inode *inode = d_inode(dentry);
+       struct inode *inode = d_inode(path->dentry);
        struct ceph_inode_info *ci = ceph_inode(inode);
        int err;