summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-04-05 14:46:01 -0500
committerSage Weil <sage@inktank.com>2013-05-01 21:18:26 -0700
commitea96571f7b865edaf1acd472e6f2cddc9fb67892 (patch)
treef77ecb81c70e9e63ab875b53c2954780f70ddb84 /net
parent5476492fba9fd0b4118aacf5b924dd29b8cca56c (diff)
downloadlinux-ea96571f7b865edaf1acd472e6f2cddc9fb67892.tar.bz2
libceph: fix possible CONFIG_BLOCK build problem
This patch: 15a0d7b libceph: record message data length did not enclose some bio-specific code inside CONFIG_BLOCK as it should have. Fix that. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/messenger.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index a6fda9532102..994192beda02 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -817,7 +817,7 @@ static bool ceph_msg_data_bio_advance(struct ceph_msg_data *data, size_t bytes)
return true;
}
-#endif
+#endif /* CONFIG_BLOCK */
/*
* For a page array, a piece comes from the first page in the array
@@ -3011,6 +3011,7 @@ void ceph_msg_data_set_pagelist(struct ceph_msg *msg,
}
EXPORT_SYMBOL(ceph_msg_data_set_pagelist);
+#ifdef CONFIG_BLOCK
void ceph_msg_data_set_bio(struct ceph_msg *msg, struct bio *bio,
size_t length)
{
@@ -3028,6 +3029,7 @@ void ceph_msg_data_set_bio(struct ceph_msg *msg, struct bio *bio,
msg->data_length = length;
}
EXPORT_SYMBOL(ceph_msg_data_set_bio);
+#endif /* CONFIG_BLOCK */
/*
* construct a new message with given type, size