kclient: whoami is __s64

diff --git a/src/kernel/debugfs.c b/src/kernel/debugfs.c
index 5de58fef5d676609a7cb72754bdf86482b968f6a..9edee64742181eb56b4e8915b02ab2dc8a093c5b 100644 (file)
--- a/src/kernel/debugfs.c
+++ b/src/kernel/debugfs.c
@@ -363,7 +363,7 @@ int ceph_debugfs_client_init(struct ceph_client *client)
 #define TMP_NAME_SIZE 16
        char name[TMP_NAME_SIZE];
 
-       snprintf(name, TMP_NAME_SIZE, "client%d", client->whoami);
+       snprintf(name, TMP_NAME_SIZE, "client%lld", client->whoami);
 
        client->debugfs_dir = debugfs_create_dir(name, ceph_debugfs_dir);
        if (!client->debugfs_dir)

diff --git a/src/kernel/mon_client.c b/src/kernel/mon_client.c
index 98ac1d55c071337deff860eb316542467737071f..d873436fb77d555253f64bdd8fd65041205fba19 100644 (file)
--- a/src/kernel/mon_client.c
+++ b/src/kernel/mon_client.c
@@ -357,8 +357,8 @@ static void handle_mount_ack(struct ceph_mon_client *monc, struct ceph_msg *msg)
        client->msgr->inst.name.num = cpu_to_le32(cnum);
        client->msgr->inst.name.type = CEPH_ENTITY_TYPE_CLIENT;
        memcpy(&client->msgr->inst.addr, &addr, sizeof(addr));
-       pr_info("ceph client%d %u.%u.%u.%u:%u fsid %llx.%llx\n", client->whoami,
-               IPQUADPORT(addr.ipaddr),
+       pr_info("ceph client%lld %u.%u.%u.%u:%u fsid %llx.%llx\n",
+               client->whoami, IPQUADPORT(addr.ipaddr),
                le64_to_cpu(__ceph_fsid_major(&client->monc.monmap->fsid)),
                le64_to_cpu(__ceph_fsid_minor(&client->monc.monmap->fsid)));
 

diff --git a/src/kernel/super.h b/src/kernel/super.h
index cc54237e98cddebf0da4a4b87b6786e3ef9208f9..8b8992dd8477711d0667d6ea01e289a386ea1dd5 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -110,7 +110,7 @@ static inline unsigned long time_sub(unsigned long a, unsigned long b)
  * mounting the same ceph filesystem/cluster.
  */
 struct ceph_client {
-       int whoami;                   /* my client number */
+       __s64 whoami;                   /* my client number */
        struct dentry *debugfs_fsid, *debugfs_monmap;
        struct dentry *debugfs_mdsmap, *debugfs_osdmap;
        struct dentry *debugfs_dir, *debugfs_dentry_lru;