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
Merge tag 'v3.5-rc1'
[linux-2.6-block.git]
/
net
/
ceph
/
osd_client.c
diff --git
a/net/ceph/osd_client.c
b/net/ceph/osd_client.c
index c178c770acb4845964efac43782fafd8983670fc..db2da54f7336f12a31932791aa67e5c3ff3edbb9 100644
(file)
--- a/
net/ceph/osd_client.c
+++ b/
net/ceph/osd_client.c
@@
-1216,7
+1216,7
@@
static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
}
if (!req->r_got_reply) {
- unsigned bytes;
+ unsigned
int
bytes;
req->r_result = le32_to_cpu(rhead->result);
bytes = le32_to_cpu(msg->hdr.data_len);