aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph/messenger.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-04-15 01:58:06 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-15 12:44:40 -0400
commit95c961747284a6b83a5e2d81240e214b0fa3464d (patch)
treec7be86a00db3605a48a03109fafcbe31039ca2e0 /net/ceph/messenger.c
parent5e73ea1a31c3612aa6dfe44f864ca5b7b6a4cff9 (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/messenger.c')
-rw-r--r--net/ceph/messenger.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index f0993af2ae4d..36fa6bf68498 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)
816static int write_partial_msg_pages(struct ceph_connection *con) 816static 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
1555static int read_partial_message_pages(struct ceph_connection *con, 1555static 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
1588static int read_partial_message_bio(struct ceph_connection *con, 1588static 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);