xfs: fix missing KM_NOFS tags to keep lockdep happy

[firefly-linux-kernel-4.4.55.git] / fs / ceph / ioctl.c

diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index 4a989345b37bd368e62ede9ddc0032ff8e5b8fa4..e0b4ef31d3c870c9e73fecad303e9f9957542385 100644 (file)
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -208,8 +208,9 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
 
        snprintf(dl.object_name, sizeof(dl.object_name), "%llx.%08llx",
                 ceph_ino(inode), dl.object_no);
-       ceph_calc_object_layout(&pgid, dl.object_name, &ci->i_layout,
-                               osdc->osdmap);
+
+       ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
+               ceph_file_layout_pg_pool(ci->i_layout));
 
        dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid);
        if (dl.osd >= 0) {