Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 22:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

libceph: don't use bio_iter as a flag

Browse Source 
Recently a bug was fixed in which the bio_iter field in a ceph
message was not being properly re-initialized when a message got
re-transmitted:
    commit 43643528cc
    Author: Yan, Zheng <zheng.z.yan@intel.com>
    rbd: Clear ceph_msg->bio_iter for retransmitted message

We are now only initializing the bio_iter field when we are about to
start to write message data (in prepare_write_message_data()),
rather than every time we are attempting to write any portion of the
message data (in write_partial_msg_pages()).  This means we no
longer need to use the msg->bio_iter field as a flag.

So just don't do that any more.  Trust prepare_write_message_data()
to ensure msg->bio_iter is properly initialized, every time we are
about to begin writing (or re-writing) a message's bio data.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Alex Elder 2012-06-11 14:57:13 -05:00 committed by Sage Weil
parent 572c588eda
commit abdaa6a849
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ceph/messenger.c
View File

@ -604,7 +604,7 @@ static void prepare_write_message_data(struct ceph_connection *con)
else else
con->out_msg_pos.page_pos = 0; con->out_msg_pos.page_pos = 0;
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
if (msg->bio && !msg->bio_iter) if (msg->bio)
init_bio_iter(msg->bio, &msg->bio_iter, &msg->bio_seg); init_bio_iter(msg->bio, &msg->bio_iter, &msg->bio_seg);
#endif #endif
con->out_msg_pos.data_pos = 0; con->out_msg_pos.data_pos = 0;
@ -672,10 +672,6 @@ static void prepare_write_message(struct ceph_connection *con)
m->hdr.seq = cpu_to_le64(++con->out_seq); m->hdr.seq = cpu_to_le64(++con->out_seq);
m->needs_out_seq = false; m->needs_out_seq = false;
} }
#ifdef CONFIG_BLOCK
else
m->bio_iter = NULL;
#endif
dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n", dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n",
m, con->out_seq, le16_to_cpu(m->hdr.type), m, con->out_seq, le16_to_cpu(m->hdr.type),