diff options
| author | Alex Elder <elder@inktank.com> | 2013-01-31 16:02:01 -0600 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-02-13 18:27:40 -0800 |
| commit | 3ebc21f7bc2f9c0145bbbf0f12430b766a200f9f (patch) | |
| tree | 1434bd538dcd99ae38044580b29d83db84a1a06d /include/linux/ceph | |
| parent | 695b711933689ea51af782760f4b1e2c6a42a631 (diff) | |
| download | op-kernel-dev-3ebc21f7bc2f9c0145bbbf0f12430b766a200f9f.zip op-kernel-dev-3ebc21f7bc2f9c0145bbbf0f12430b766a200f9f.tar.gz | |
libceph: fix messenger CONFIG_BLOCK dependencies
The ceph messenger has a few spots that are only used when
bio messages are supported, and that's only when CONFIG_BLOCK
is defined. This surrounds a couple of spots with #ifdef's
that would cause a problem if CONFIG_BLOCK were not present
in the kernel configuration.
This resolves:
http://tracker.ceph.com/issues/3976
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'include/linux/ceph')
| -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 14ba5ee..60903e0 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; |
