aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/messenger.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index fedad914b238..3a4330371d88 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -604,7 +604,7 @@ static void prepare_write_message_data(struct ceph_connection *con)
604 else 604 else
605 con->out_msg_pos.page_pos = 0; 605 con->out_msg_pos.page_pos = 0;
606#ifdef CONFIG_BLOCK 606#ifdef CONFIG_BLOCK
607 if (msg->bio && !msg->bio_iter) 607 if (msg->bio)
608 init_bio_iter(msg->bio, &msg->bio_iter, &msg->bio_seg); 608 init_bio_iter(msg->bio, &msg->bio_iter, &msg->bio_seg);
609#endif 609#endif
610 con->out_msg_pos.data_pos = 0; 610 con->out_msg_pos.data_pos = 0;
@@ -672,10 +672,6 @@ static void prepare_write_message(struct ceph_connection *con)
672 m->hdr.seq = cpu_to_le64(++con->out_seq); 672 m->hdr.seq = cpu_to_le64(++con->out_seq);
673 m->needs_out_seq = false; 673 m->needs_out_seq = false;
674 } 674 }
675#ifdef CONFIG_BLOCK
676 else
677 m->bio_iter = NULL;
678#endif
679 675
680 dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n", 676 dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n",
681 m, con->out_seq, le16_to_cpu(m->hdr.type), 677 m, con->out_seq, le16_to_cpu(m->hdr.type),