2 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 14ba5ee738a9..60903e0f665c 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -83,9 +83,11 @@ struct ceph_msg {
         struct list_head list_head;
 
         struct kref kref;
+#ifdef CONFIG_BLOCK
         struct bio  *bio;               /* instead of pages/pagelist */
         struct bio  *bio_iter;          /* bio iterator */
         int bio_seg;                    /* current bio segment */
+#endif /* CONFIG_BLOCK */
         struct ceph_pagelist *trail;    /* the trailing part of the data */
         bool front_is_vmalloc;
         bool more_to_follow;
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 5ccf87ed8d68..8a62a559a2aa 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -9,8 +9,9 @@
 #include <linux/slab.h>
 #include <linux/socket.h>
 #include <linux/string.h>
+#ifdef  CONFIG_BLOCK
 #include <linux/bio.h>
-#include <linux/blkdev.h>
+#endif  /* CONFIG_BLOCK */
 #include <linux/dns_resolver.h>
 #include <net/tcp.h>
 
@@ -2651,9 +2652,11 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,
         m->page_alignment = 0;
         m->pages = NULL;
         m->pagelist = NULL;
+#ifdef  CONFIG_BLOCK
         m->bio = NULL;
         m->bio_iter = NULL;
         m->bio_seg = 0;
+#endif  /* CONFIG_BLOCK */
         m->trail = NULL;
 
         /* front */