diff options
author | Alex Elder <elder@inktank.com> | 2013-04-05 15:46:01 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-05-02 00:18:26 -0400 |
commit | ea96571f7b865edaf1acd472e6f2cddc9fb67892 (patch) | |
tree | f77ecb81c70e9e63ab875b53c2954780f70ddb84 /include | |
parent | 5476492fba9fd0b4118aacf5b924dd29b8cca56c (diff) |
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 'include')
-rw-r--r-- | include/linux/ceph/messenger.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index b832c0ce899a..cdeebae03e0d 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h | |||
@@ -271,8 +271,10 @@ extern void ceph_msg_data_set_pages(struct ceph_msg *msg, struct page **pages, | |||
271 | size_t length, size_t alignment); | 271 | size_t length, size_t alignment); |
272 | extern void ceph_msg_data_set_pagelist(struct ceph_msg *msg, | 272 | extern void ceph_msg_data_set_pagelist(struct ceph_msg *msg, |
273 | struct ceph_pagelist *pagelist); | 273 | struct ceph_pagelist *pagelist); |
274 | #ifdef CONFIG_BLOCK | ||
274 | extern void ceph_msg_data_set_bio(struct ceph_msg *msg, struct bio *bio, | 275 | extern void ceph_msg_data_set_bio(struct ceph_msg *msg, struct bio *bio, |
275 | size_t length); | 276 | size_t length); |
277 | #endif /* CONFIG_BLOCK */ | ||
276 | 278 | ||
277 | extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags, | 279 | extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags, |
278 | bool can_fail); | 280 | bool can_fail); |