summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-30 16:23:22 -0700
committerSage Weil <sage@inktank.com>2012-07-30 16:23:22 -0700
commit1fe60e51a3744528f3939b1b1167ca909133d9ae (patch)
tree06ca8731f1be425ffbd6ffcdfd9e94b89b05ceec /net
parentd1f57ea66369b5c34bd42f104b8070db409447f9 (diff)
downloadlinux-3.10-1fe60e51a3744528f3939b1b1167ca909133d9ae.tar.gz
linux-3.10-1fe60e51a3744528f3939b1b1167ca909133d9ae.tar.bz2
linux-3.10-1fe60e51a3744528f3939b1b1167ca909133d9ae.zip
libceph: move feature bits to separate header
This is simply cleanup that will keep things more closely synced with the userland code. Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Alex Elder <elder@inktank.com> Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/ceph_common.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 3b45e01fa8d..69e38db28e5 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -17,6 +17,7 @@
#include <linux/string.h>
+#include <linux/ceph/ceph_features.h>
#include <linux/ceph/libceph.h>
#include <linux/ceph/debugfs.h>
#include <linux/ceph/decode.h>
@@ -460,9 +461,9 @@ struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private,
client->auth_err = 0;
client->extra_mon_dispatch = NULL;
- client->supported_features = CEPH_FEATURE_SUPPORTED_DEFAULT |
+ client->supported_features = CEPH_FEATURES_SUPPORTED_DEFAULT |
supported_features;
- client->required_features = CEPH_FEATURE_REQUIRED_DEFAULT |
+ client->required_features = CEPH_FEATURES_REQUIRED_DEFAULT |
required_features;
/* msgr */