aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph/mon_client.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ceph/mon_client.c')
-rw-r--r--net/ceph/mon_client.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 1845cde26227..10d6008d31f2 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -168,7 +168,7 @@ static bool __sub_expired(struct ceph_mon_client *monc)
168 */ 168 */
169static void __schedule_delayed(struct ceph_mon_client *monc) 169static void __schedule_delayed(struct ceph_mon_client *monc)
170{ 170{
171 unsigned delay; 171 unsigned int delay;
172 172
173 if (monc->cur_mon < 0 || __sub_expired(monc)) 173 if (monc->cur_mon < 0 || __sub_expired(monc))
174 delay = 10 * HZ; 174 delay = 10 * HZ;
@@ -184,7 +184,7 @@ static void __schedule_delayed(struct ceph_mon_client *monc)
184static void __send_subscribe(struct ceph_mon_client *monc) 184static void __send_subscribe(struct ceph_mon_client *monc)
185{ 185{
186 dout("__send_subscribe sub_sent=%u exp=%u want_osd=%d\n", 186 dout("__send_subscribe sub_sent=%u exp=%u want_osd=%d\n",
187 (unsigned)monc->sub_sent, __sub_expired(monc), 187 (unsigned int)monc->sub_sent, __sub_expired(monc),
188 monc->want_next_osdmap); 188 monc->want_next_osdmap);
189 if ((__sub_expired(monc) && !monc->sub_sent) || 189 if ((__sub_expired(monc) && !monc->sub_sent) ||
190 monc->want_next_osdmap == 1) { 190 monc->want_next_osdmap == 1) {
@@ -201,7 +201,7 @@ static void __send_subscribe(struct ceph_mon_client *monc)
201 201
202 if (monc->want_next_osdmap) { 202 if (monc->want_next_osdmap) {
203 dout("__send_subscribe to 'osdmap' %u\n", 203 dout("__send_subscribe to 'osdmap' %u\n",
204 (unsigned)monc->have_osdmap); 204 (unsigned int)monc->have_osdmap);
205 ceph_encode_string(&p, end, "osdmap", 6); 205 ceph_encode_string(&p, end, "osdmap", 6);
206 i = p; 206 i = p;
207 i->have = cpu_to_le64(monc->have_osdmap); 207 i->have = cpu_to_le64(monc->have_osdmap);
@@ -211,7 +211,7 @@ static void __send_subscribe(struct ceph_mon_client *monc)
211 } 211 }
212 if (monc->want_mdsmap) { 212 if (monc->want_mdsmap) {
213 dout("__send_subscribe to 'mdsmap' %u+\n", 213 dout("__send_subscribe to 'mdsmap' %u+\n",
214 (unsigned)monc->have_mdsmap); 214 (unsigned int)monc->have_mdsmap);
215 ceph_encode_string(&p, end, "mdsmap", 6); 215 ceph_encode_string(&p, end, "mdsmap", 6);
216 i = p; 216 i = p;
217 i->have = cpu_to_le64(monc->have_mdsmap); 217 i->have = cpu_to_le64(monc->have_mdsmap);
@@ -236,7 +236,7 @@ static void __send_subscribe(struct ceph_mon_client *monc)
236static void handle_subscribe_ack(struct ceph_mon_client *monc, 236static void handle_subscribe_ack(struct ceph_mon_client *monc,
237 struct ceph_msg *msg) 237 struct ceph_msg *msg)
238{ 238{
239 unsigned seconds; 239 unsigned int seconds;
240 struct ceph_mon_subscribe_ack *h = msg->front.iov_base; 240 struct ceph_mon_subscribe_ack *h = msg->front.iov_base;
241 241
242 if (msg->front.iov_len < sizeof(*h)) 242 if (msg->front.iov_len < sizeof(*h))