From 2bcf499980589797b52d06296ae2a8acda2f122e Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 11 Jun 2012 14:57:13 -0500 Subject: [PATCH] --- yaml --- r: 320290 b: refs/heads/master c: abdaa6a849af1d63153682c11f5bbb22dacb1f6b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b3f85312267f..d4cd53a4ba83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 572c588edadaa3da3992bd8a0fed830bbcc861f8 +refs/heads/master: abdaa6a849af1d63153682c11f5bbb22dacb1f6b diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index fedad914b238..3a4330371d88 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/net/ceph/messenger.c @@ -604,7 +604,7 @@ static void prepare_write_message_data(struct ceph_connection *con) else con->out_msg_pos.page_pos = 0; #ifdef CONFIG_BLOCK - if (msg->bio && !msg->bio_iter) + if (msg->bio) init_bio_iter(msg->bio, &msg->bio_iter, &msg->bio_seg); #endif 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->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", m, con->out_seq, le16_to_cpu(m->hdr.type),