From: Sage Weil <sage@newdream.net>
Date: Wed, 2 Sep 2009 19:54:08 +0000 (-0700)
Subject: kclient: whoami is __s64
X-Git-Tag: v0.14~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e67dd8d0fed2ce5fa1987039d7d019362a3519a;p=ceph.git

kclient: whoami is __s64
---

diff --git a/src/kernel/debugfs.c b/src/kernel/debugfs.c
index 5de58fef5d6..9edee647421 100644
--- 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 98ac1d55c07..d873436fb77 100644
--- 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 cc54237e98c..8b8992dd847 100644
--- 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;