diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-04-15 01:58:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-15 12:44:40 -0400 |
commit | 95c961747284a6b83a5e2d81240e214b0fa3464d (patch) | |
tree | c7be86a00db3605a48a03109fafcbe31039ca2e0 /net/ceph | |
parent | 5e73ea1a31c3612aa6dfe44f864ca5b7b6a4cff9 (diff) |
net: cleanup unsigned to unsigned int
Use of "unsigned int" is preferred to bare "unsigned" in net tree.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ceph')
-rw-r--r-- | net/ceph/auth_x.h | 6 | ||||
-rw-r--r-- | net/ceph/ceph_common.c | 4 | ||||
-rw-r--r-- | net/ceph/ceph_hash.c | 6 | ||||
-rw-r--r-- | net/ceph/crush/mapper.c | 8 | ||||
-rw-r--r-- | net/ceph/debugfs.c | 6 | ||||
-rw-r--r-- | net/ceph/messenger.c | 16 | ||||
-rw-r--r-- | net/ceph/mon_client.c | 10 | ||||
-rw-r--r-- | net/ceph/osd_client.c | 2 | ||||
-rw-r--r-- | net/ceph/osdmap.c | 14 |
9 files changed, 36 insertions, 36 deletions
diff --git a/net/ceph/auth_x.h b/net/ceph/auth_x.h index e02da7a5c5a..f459e93b774 100644 --- a/net/ceph/auth_x.h +++ b/net/ceph/auth_x.h | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | struct ceph_x_ticket_handler { | 14 | struct ceph_x_ticket_handler { |
15 | struct rb_node node; | 15 | struct rb_node node; |
16 | unsigned service; | 16 | unsigned int service; |
17 | 17 | ||
18 | struct ceph_crypto_key session_key; | 18 | struct ceph_crypto_key session_key; |
19 | struct ceph_timespec validity; | 19 | struct ceph_timespec validity; |
@@ -27,7 +27,7 @@ struct ceph_x_ticket_handler { | |||
27 | 27 | ||
28 | struct ceph_x_authorizer { | 28 | struct ceph_x_authorizer { |
29 | struct ceph_buffer *buf; | 29 | struct ceph_buffer *buf; |
30 | unsigned service; | 30 | unsigned int service; |
31 | u64 nonce; | 31 | u64 nonce; |
32 | char reply_buf[128]; /* big enough for encrypted blob */ | 32 | char reply_buf[128]; /* big enough for encrypted blob */ |
33 | }; | 33 | }; |
@@ -38,7 +38,7 @@ struct ceph_x_info { | |||
38 | bool starting; | 38 | bool starting; |
39 | u64 server_challenge; | 39 | u64 server_challenge; |
40 | 40 | ||
41 | unsigned have_keys; | 41 | unsigned int have_keys; |
42 | struct rb_root ticket_handlers; | 42 | struct rb_root ticket_handlers; |
43 | 43 | ||
44 | struct ceph_x_authorizer auth_authorizer; | 44 | struct ceph_x_authorizer auth_authorizer; |
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index cc913193d99..a776f751edb 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c | |||
@@ -441,8 +441,8 @@ EXPORT_SYMBOL(ceph_client_id); | |||
441 | * create a fresh client instance | 441 | * create a fresh client instance |
442 | */ | 442 | */ |
443 | struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private, | 443 | struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private, |
444 | unsigned supported_features, | 444 | unsigned int supported_features, |
445 | unsigned required_features) | 445 | unsigned int required_features) |
446 | { | 446 | { |
447 | struct ceph_client *client; | 447 | struct ceph_client *client; |
448 | struct ceph_entity_addr *myaddr = NULL; | 448 | struct ceph_entity_addr *myaddr = NULL; |
diff --git a/net/ceph/ceph_hash.c b/net/ceph/ceph_hash.c index 0a1b53bce76..67bb1f11e61 100644 --- a/net/ceph/ceph_hash.c +++ b/net/ceph/ceph_hash.c | |||
@@ -20,7 +20,7 @@ | |||
20 | c = c - a; c = c - b; c = c ^ (b >> 15); \ | 20 | c = c - a; c = c - b; c = c ^ (b >> 15); \ |
21 | } while (0) | 21 | } while (0) |
22 | 22 | ||
23 | unsigned ceph_str_hash_rjenkins(const char *str, unsigned length) | 23 | unsigned int ceph_str_hash_rjenkins(const char *str, unsigned int length) |
24 | { | 24 | { |
25 | const unsigned char *k = (const unsigned char *)str; | 25 | const unsigned char *k = (const unsigned char *)str; |
26 | __u32 a, b, c; /* the internal state */ | 26 | __u32 a, b, c; /* the internal state */ |
@@ -81,7 +81,7 @@ unsigned ceph_str_hash_rjenkins(const char *str, unsigned length) | |||
81 | /* | 81 | /* |
82 | * linux dcache hash | 82 | * linux dcache hash |
83 | */ | 83 | */ |
84 | unsigned ceph_str_hash_linux(const char *str, unsigned length) | 84 | unsigned int ceph_str_hash_linux(const char *str, unsigned int length) |
85 | { | 85 | { |
86 | unsigned long hash = 0; | 86 | unsigned long hash = 0; |
87 | unsigned char c; | 87 | unsigned char c; |
@@ -94,7 +94,7 @@ unsigned ceph_str_hash_linux(const char *str, unsigned length) | |||
94 | } | 94 | } |
95 | 95 | ||
96 | 96 | ||
97 | unsigned ceph_str_hash(int type, const char *s, unsigned len) | 97 | unsigned int ceph_str_hash(int type, const char *s, unsigned int len) |
98 | { | 98 | { |
99 | switch (type) { | 99 | switch (type) { |
100 | case CEPH_STR_HASH_LINUX: | 100 | case CEPH_STR_HASH_LINUX: |
diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c index b79747c4b64..854ac53f56c 100644 --- a/net/ceph/crush/mapper.c +++ b/net/ceph/crush/mapper.c | |||
@@ -68,8 +68,8 @@ int crush_find_rule(struct crush_map *map, int ruleset, int type, int size) | |||
68 | static int bucket_perm_choose(struct crush_bucket *bucket, | 68 | static int bucket_perm_choose(struct crush_bucket *bucket, |
69 | int x, int r) | 69 | int x, int r) |
70 | { | 70 | { |
71 | unsigned pr = r % bucket->size; | 71 | unsigned int pr = r % bucket->size; |
72 | unsigned i, s; | 72 | unsigned int i, s; |
73 | 73 | ||
74 | /* start a new permutation if @x has changed */ | 74 | /* start a new permutation if @x has changed */ |
75 | if (bucket->perm_x != x || bucket->perm_n == 0) { | 75 | if (bucket->perm_x != x || bucket->perm_n == 0) { |
@@ -100,13 +100,13 @@ static int bucket_perm_choose(struct crush_bucket *bucket, | |||
100 | for (i = 0; i < bucket->perm_n; i++) | 100 | for (i = 0; i < bucket->perm_n; i++) |
101 | dprintk(" perm_choose have %d: %d\n", i, bucket->perm[i]); | 101 | dprintk(" perm_choose have %d: %d\n", i, bucket->perm[i]); |
102 | while (bucket->perm_n <= pr) { | 102 | while (bucket->perm_n <= pr) { |
103 | unsigned p = bucket->perm_n; | 103 | unsigned int p = bucket->perm_n; |
104 | /* no point in swapping the final entry */ | 104 | /* no point in swapping the final entry */ |
105 | if (p < bucket->size - 1) { | 105 | if (p < bucket->size - 1) { |
106 | i = crush_hash32_3(bucket->hash, x, bucket->id, p) % | 106 | i = crush_hash32_3(bucket->hash, x, bucket->id, p) % |
107 | (bucket->size - p); | 107 | (bucket->size - p); |
108 | if (i) { | 108 | if (i) { |
109 | unsigned t = bucket->perm[p + i]; | 109 | unsigned int t = bucket->perm[p + i]; |
110 | bucket->perm[p + i] = bucket->perm[p]; | 110 | bucket->perm[p + i] = bucket->perm[p]; |
111 | bucket->perm[p] = t; | 111 | bucket->perm[p] = t; |
112 | } | 112 | } |
diff --git a/net/ceph/debugfs.c b/net/ceph/debugfs.c index 27d4ea315d1..54b531a0112 100644 --- a/net/ceph/debugfs.c +++ b/net/ceph/debugfs.c | |||
@@ -94,9 +94,9 @@ static int monc_show(struct seq_file *s, void *p) | |||
94 | mutex_lock(&monc->mutex); | 94 | mutex_lock(&monc->mutex); |
95 | 95 | ||
96 | if (monc->have_mdsmap) | 96 | if (monc->have_mdsmap) |
97 | seq_printf(s, "have mdsmap %u\n", (unsigned)monc->have_mdsmap); | 97 | seq_printf(s, "have mdsmap %u\n", (unsigned int)monc->have_mdsmap); |
98 | if (monc->have_osdmap) | 98 | if (monc->have_osdmap) |
99 | seq_printf(s, "have osdmap %u\n", (unsigned)monc->have_osdmap); | 99 | seq_printf(s, "have osdmap %u\n", (unsigned int)monc->have_osdmap); |
100 | if (monc->want_next_osdmap) | 100 | if (monc->want_next_osdmap) |
101 | seq_printf(s, "want next osdmap\n"); | 101 | seq_printf(s, "want next osdmap\n"); |
102 | 102 | ||
@@ -146,7 +146,7 @@ static int osdc_show(struct seq_file *s, void *pp) | |||
146 | 146 | ||
147 | if (req->r_reassert_version.epoch) | 147 | if (req->r_reassert_version.epoch) |
148 | seq_printf(s, "\t%u'%llu", | 148 | seq_printf(s, "\t%u'%llu", |
149 | (unsigned)le32_to_cpu(req->r_reassert_version.epoch), | 149 | (unsigned int)le32_to_cpu(req->r_reassert_version.epoch), |
150 | le64_to_cpu(req->r_reassert_version.version)); | 150 | le64_to_cpu(req->r_reassert_version.version)); |
151 | else | 151 | else |
152 | seq_printf(s, "\t"); | 152 | seq_printf(s, "\t"); |
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index f0993af2ae4..36fa6bf6849 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c | |||
@@ -699,7 +699,7 @@ static int prepare_write_connect(struct ceph_messenger *msgr, | |||
699 | struct ceph_connection *con, | 699 | struct ceph_connection *con, |
700 | int include_banner) | 700 | int include_banner) |
701 | { | 701 | { |
702 | unsigned global_seq = get_global_seq(con->msgr, 0); | 702 | unsigned int global_seq = get_global_seq(con->msgr, 0); |
703 | int proto; | 703 | int proto; |
704 | 704 | ||
705 | switch (con->peer_name.type) { | 705 | switch (con->peer_name.type) { |
@@ -816,7 +816,7 @@ static void iter_bio_next(struct bio **bio_iter, int *seg) | |||
816 | static int write_partial_msg_pages(struct ceph_connection *con) | 816 | static int write_partial_msg_pages(struct ceph_connection *con) |
817 | { | 817 | { |
818 | struct ceph_msg *msg = con->out_msg; | 818 | struct ceph_msg *msg = con->out_msg; |
819 | unsigned data_len = le32_to_cpu(msg->hdr.data_len); | 819 | unsigned int data_len = le32_to_cpu(msg->hdr.data_len); |
820 | size_t len; | 820 | size_t len; |
821 | bool do_datacrc = !con->msgr->nocrc; | 821 | bool do_datacrc = !con->msgr->nocrc; |
822 | int ret; | 822 | int ret; |
@@ -1554,7 +1554,7 @@ static struct ceph_msg *ceph_alloc_msg(struct ceph_connection *con, | |||
1554 | 1554 | ||
1555 | static int read_partial_message_pages(struct ceph_connection *con, | 1555 | static int read_partial_message_pages(struct ceph_connection *con, |
1556 | struct page **pages, | 1556 | struct page **pages, |
1557 | unsigned data_len, bool do_datacrc) | 1557 | unsigned int data_len, bool do_datacrc) |
1558 | { | 1558 | { |
1559 | void *p; | 1559 | void *p; |
1560 | int ret; | 1560 | int ret; |
@@ -1587,7 +1587,7 @@ static int read_partial_message_pages(struct ceph_connection *con, | |||
1587 | #ifdef CONFIG_BLOCK | 1587 | #ifdef CONFIG_BLOCK |
1588 | static int read_partial_message_bio(struct ceph_connection *con, | 1588 | static int read_partial_message_bio(struct ceph_connection *con, |
1589 | struct bio **bio_iter, int *bio_seg, | 1589 | struct bio **bio_iter, int *bio_seg, |
1590 | unsigned data_len, bool do_datacrc) | 1590 | unsigned int data_len, bool do_datacrc) |
1591 | { | 1591 | { |
1592 | struct bio_vec *bv = bio_iovec_idx(*bio_iter, *bio_seg); | 1592 | struct bio_vec *bv = bio_iovec_idx(*bio_iter, *bio_seg); |
1593 | void *p; | 1593 | void *p; |
@@ -1629,7 +1629,7 @@ static int read_partial_message(struct ceph_connection *con) | |||
1629 | struct ceph_msg *m = con->in_msg; | 1629 | struct ceph_msg *m = con->in_msg; |
1630 | int ret; | 1630 | int ret; |
1631 | int to, left; | 1631 | int to, left; |
1632 | unsigned front_len, middle_len, data_len; | 1632 | unsigned int front_len, middle_len, data_len; |
1633 | bool do_datacrc = !con->msgr->nocrc; | 1633 | bool do_datacrc = !con->msgr->nocrc; |
1634 | int skip; | 1634 | int skip; |
1635 | u64 seq; | 1635 | u64 seq; |
@@ -2345,9 +2345,9 @@ void ceph_con_revoke_message(struct ceph_connection *con, struct ceph_msg *msg) | |||
2345 | { | 2345 | { |
2346 | mutex_lock(&con->mutex); | 2346 | mutex_lock(&con->mutex); |
2347 | if (con->in_msg && con->in_msg == msg) { | 2347 | if (con->in_msg && con->in_msg == msg) { |
2348 | unsigned front_len = le32_to_cpu(con->in_hdr.front_len); | 2348 | unsigned int front_len = le32_to_cpu(con->in_hdr.front_len); |
2349 | unsigned middle_len = le32_to_cpu(con->in_hdr.middle_len); | 2349 | unsigned int middle_len = le32_to_cpu(con->in_hdr.middle_len); |
2350 | unsigned data_len = le32_to_cpu(con->in_hdr.data_len); | 2350 | unsigned int data_len = le32_to_cpu(con->in_hdr.data_len); |
2351 | 2351 | ||
2352 | /* skip rest of message */ | 2352 | /* skip rest of message */ |
2353 | dout("con_revoke_pages %p msg %p revoked\n", con, msg); | 2353 | dout("con_revoke_pages %p msg %p revoked\n", con, msg); |
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 1845cde2622..10d6008d31f 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 | */ |
169 | static void __schedule_delayed(struct ceph_mon_client *monc) | 169 | static 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) | |||
184 | static void __send_subscribe(struct ceph_mon_client *monc) | 184 | static 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) | |||
236 | static void handle_subscribe_ack(struct ceph_mon_client *monc, | 236 | static 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)) |
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 5e254055c91..1b0ef3c4d39 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -1214,7 +1214,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg, | |||
1214 | } | 1214 | } |
1215 | 1215 | ||
1216 | if (!req->r_got_reply) { | 1216 | if (!req->r_got_reply) { |
1217 | unsigned bytes; | 1217 | unsigned int bytes; |
1218 | 1218 | ||
1219 | req->r_result = le32_to_cpu(rhead->result); | 1219 | req->r_result = le32_to_cpu(rhead->result); |
1220 | bytes = le32_to_cpu(msg->hdr.data_len); | 1220 | bytes = le32_to_cpu(msg->hdr.data_len); |
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index 29ad46ec9dc..56e561a6900 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c | |||
@@ -38,7 +38,7 @@ done: | |||
38 | 38 | ||
39 | /* maps */ | 39 | /* maps */ |
40 | 40 | ||
41 | static int calc_bits_of(unsigned t) | 41 | static int calc_bits_of(unsigned int t) |
42 | { | 42 | { |
43 | int b = 0; | 43 | int b = 0; |
44 | while (t) { | 44 | while (t) { |
@@ -154,7 +154,7 @@ static struct crush_map *crush_decode(void *pbyval, void *end) | |||
154 | magic = ceph_decode_32(p); | 154 | magic = ceph_decode_32(p); |
155 | if (magic != CRUSH_MAGIC) { | 155 | if (magic != CRUSH_MAGIC) { |
156 | pr_err("crush_decode magic %x != current %x\n", | 156 | pr_err("crush_decode magic %x != current %x\n", |
157 | (unsigned)magic, (unsigned)CRUSH_MAGIC); | 157 | (unsigned int)magic, (unsigned int)CRUSH_MAGIC); |
158 | goto bad; | 158 | goto bad; |
159 | } | 159 | } |
160 | c->max_buckets = ceph_decode_32(p); | 160 | c->max_buckets = ceph_decode_32(p); |
@@ -460,7 +460,7 @@ static void __remove_pg_pool(struct rb_root *root, struct ceph_pg_pool_info *pi) | |||
460 | 460 | ||
461 | static int __decode_pool(void **p, void *end, struct ceph_pg_pool_info *pi) | 461 | static int __decode_pool(void **p, void *end, struct ceph_pg_pool_info *pi) |
462 | { | 462 | { |
463 | unsigned n, m; | 463 | unsigned int n, m; |
464 | 464 | ||
465 | ceph_decode_copy(p, &pi->v, sizeof(pi->v)); | 465 | ceph_decode_copy(p, &pi->v, sizeof(pi->v)); |
466 | calc_pg_masks(pi); | 466 | calc_pg_masks(pi); |
@@ -970,7 +970,7 @@ void ceph_calc_file_object_mapping(struct ceph_file_layout *layout, | |||
970 | objsetno = stripeno / su_per_object; | 970 | objsetno = stripeno / su_per_object; |
971 | 971 | ||
972 | *ono = objsetno * sc + stripepos; | 972 | *ono = objsetno * sc + stripepos; |
973 | dout("objset %u * sc %u = ono %u\n", objsetno, sc, (unsigned)*ono); | 973 | dout("objset %u * sc %u = ono %u\n", objsetno, sc, (unsigned int)*ono); |
974 | 974 | ||
975 | /* *oxoff = *off % layout->fl_stripe_unit; # offset in su */ | 975 | /* *oxoff = *off % layout->fl_stripe_unit; # offset in su */ |
976 | t = off; | 976 | t = off; |
@@ -998,12 +998,12 @@ int ceph_calc_object_layout(struct ceph_object_layout *ol, | |||
998 | struct ceph_file_layout *fl, | 998 | struct ceph_file_layout *fl, |
999 | struct ceph_osdmap *osdmap) | 999 | struct ceph_osdmap *osdmap) |
1000 | { | 1000 | { |
1001 | unsigned num, num_mask; | 1001 | unsigned int num, num_mask; |
1002 | struct ceph_pg pgid; | 1002 | struct ceph_pg pgid; |
1003 | s32 preferred = (s32)le32_to_cpu(fl->fl_pg_preferred); | 1003 | s32 preferred = (s32)le32_to_cpu(fl->fl_pg_preferred); |
1004 | int poolid = le32_to_cpu(fl->fl_pg_pool); | 1004 | int poolid = le32_to_cpu(fl->fl_pg_pool); |
1005 | struct ceph_pg_pool_info *pool; | 1005 | struct ceph_pg_pool_info *pool; |
1006 | unsigned ps; | 1006 | unsigned int ps; |
1007 | 1007 | ||
1008 | BUG_ON(!osdmap); | 1008 | BUG_ON(!osdmap); |
1009 | 1009 | ||
@@ -1045,7 +1045,7 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid, | |||
1045 | struct ceph_pg_mapping *pg; | 1045 | struct ceph_pg_mapping *pg; |
1046 | struct ceph_pg_pool_info *pool; | 1046 | struct ceph_pg_pool_info *pool; |
1047 | int ruleno; | 1047 | int ruleno; |
1048 | unsigned poolid, ps, pps, t; | 1048 | unsigned int poolid, ps, pps, t; |
1049 | int preferred; | 1049 | int preferred; |
1050 | 1050 | ||
1051 | poolid = le32_to_cpu(pgid.pool); | 1051 | poolid = le32_to_cpu(pgid.pool); |