diff options
author | Sage Weil <sage@newdream.net> | 2010-03-01 18:25:00 -0500 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-03-01 18:25:00 -0500 |
commit | 3ca02ef96e119d36bc1752baeae7dd0c59c2f325 (patch) | |
tree | 5ef2a149d0f67b3f59fd5c4b168712046f7ce7f2 /fs/ceph/messenger.c | |
parent | 70edb55bdfa8922c8ad40bc5a67abb6d9fee8d47 (diff) |
ceph: reset front len on return to msgpool; BUG on mismatched front iov
Reset msg front len when a message is returned to the pool: the caller
may have changed it.
BUG if we try to send a message with a hdr.front_len that doesn't match
the front iov.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/messenger.c')
-rw-r--r-- | fs/ceph/messenger.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c index bf4590c77cf6..781656a49bf8 100644 --- a/fs/ceph/messenger.c +++ b/fs/ceph/messenger.c | |||
@@ -1954,6 +1954,8 @@ void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg) | |||
1954 | msg->hdr.src.addr = con->msgr->my_enc_addr; | 1954 | msg->hdr.src.addr = con->msgr->my_enc_addr; |
1955 | msg->hdr.orig_src = msg->hdr.src; | 1955 | msg->hdr.orig_src = msg->hdr.src; |
1956 | 1956 | ||
1957 | BUG_ON(msg->front.iov_len != le32_to_cpu(msg->hdr.front_len)); | ||
1958 | |||
1957 | /* queue */ | 1959 | /* queue */ |
1958 | mutex_lock(&con->mutex); | 1960 | mutex_lock(&con->mutex); |
1959 | BUG_ON(!list_empty(&msg->list_head)); | 1961 | BUG_ON(!list_empty(&msg->list_head)); |