projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: cleanup unsigned to unsigned int
[linux-2.6-block.git]
/
net
/
ceph
/
messenger.c
diff --git
a/net/ceph/messenger.c
b/net/ceph/messenger.c
index f0993af2ae4deff311f2da78a14bcbe14b2fb8c2..36fa6bf684981688ff95c22788acb8db721271de 100644
(file)
--- a/
net/ceph/messenger.c
+++ b/
net/ceph/messenger.c
@@
-699,7
+699,7
@@
static int prepare_write_connect(struct ceph_messenger *msgr,
struct ceph_connection *con,
int include_banner)
{
struct ceph_connection *con,
int include_banner)
{
- unsigned global_seq = get_global_seq(con->msgr, 0);
+ unsigned
int
global_seq = get_global_seq(con->msgr, 0);
int proto;
switch (con->peer_name.type) {
int proto;
switch (con->peer_name.type) {
@@
-816,7
+816,7
@@
static void iter_bio_next(struct bio **bio_iter, int *seg)
static int write_partial_msg_pages(struct ceph_connection *con)
{
struct ceph_msg *msg = con->out_msg;
static int write_partial_msg_pages(struct ceph_connection *con)
{
struct ceph_msg *msg = con->out_msg;
- unsigned data_len = le32_to_cpu(msg->hdr.data_len);
+ unsigned
int
data_len = le32_to_cpu(msg->hdr.data_len);
size_t len;
bool do_datacrc = !con->msgr->nocrc;
int ret;
size_t len;
bool do_datacrc = !con->msgr->nocrc;
int ret;
@@
-1554,7
+1554,7
@@
static struct ceph_msg *ceph_alloc_msg(struct ceph_connection *con,
static int read_partial_message_pages(struct ceph_connection *con,
struct page **pages,
static int read_partial_message_pages(struct ceph_connection *con,
struct page **pages,
- unsigned data_len, bool do_datacrc)
+ unsigned
int
data_len, bool do_datacrc)
{
void *p;
int ret;
{
void *p;
int ret;
@@
-1587,7
+1587,7
@@
static int read_partial_message_pages(struct ceph_connection *con,
#ifdef CONFIG_BLOCK
static int read_partial_message_bio(struct ceph_connection *con,
struct bio **bio_iter, int *bio_seg,
#ifdef CONFIG_BLOCK
static int read_partial_message_bio(struct ceph_connection *con,
struct bio **bio_iter, int *bio_seg,
- unsigned data_len, bool do_datacrc)
+ unsigned
int
data_len, bool do_datacrc)
{
struct bio_vec *bv = bio_iovec_idx(*bio_iter, *bio_seg);
void *p;
{
struct bio_vec *bv = bio_iovec_idx(*bio_iter, *bio_seg);
void *p;
@@
-1629,7
+1629,7
@@
static int read_partial_message(struct ceph_connection *con)
struct ceph_msg *m = con->in_msg;
int ret;
int to, left;
struct ceph_msg *m = con->in_msg;
int ret;
int to, left;
- unsigned front_len, middle_len, data_len;
+ unsigned
int
front_len, middle_len, data_len;
bool do_datacrc = !con->msgr->nocrc;
int skip;
u64 seq;
bool do_datacrc = !con->msgr->nocrc;
int skip;
u64 seq;
@@
-2345,9
+2345,9
@@
void ceph_con_revoke_message(struct ceph_connection *con, struct ceph_msg *msg)
{
mutex_lock(&con->mutex);
if (con->in_msg && con->in_msg == msg) {
{
mutex_lock(&con->mutex);
if (con->in_msg && con->in_msg == msg) {
- unsigned front_len = le32_to_cpu(con->in_hdr.front_len);
- unsigned middle_len = le32_to_cpu(con->in_hdr.middle_len);
- unsigned data_len = le32_to_cpu(con->in_hdr.data_len);
+ unsigned
int
front_len = le32_to_cpu(con->in_hdr.front_len);
+ unsigned
int
middle_len = le32_to_cpu(con->in_hdr.middle_len);
+ unsigned
int
data_len = le32_to_cpu(con->in_hdr.data_len);
/* skip rest of message */
dout("con_revoke_pages %p msg %p revoked\n", con, msg);
/* skip rest of message */
dout("con_revoke_pages %p msg %p revoked\n", con, msg);