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>
This commit is contained in:
parent
d1f57ea663
commit
1fe60e51a3
|
@ -10,6 +10,7 @@
|
||||||
#include "super.h"
|
#include "super.h"
|
||||||
#include "mds_client.h"
|
#include "mds_client.h"
|
||||||
|
|
||||||
|
#include <linux/ceph/ceph_features.h>
|
||||||
#include <linux/ceph/messenger.h>
|
#include <linux/ceph/messenger.h>
|
||||||
#include <linux/ceph/decode.h>
|
#include <linux/ceph/decode.h>
|
||||||
#include <linux/ceph/pagelist.h>
|
#include <linux/ceph/pagelist.h>
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include "super.h"
|
#include "super.h"
|
||||||
#include "mds_client.h"
|
#include "mds_client.h"
|
||||||
|
|
||||||
|
#include <linux/ceph/ceph_features.h>
|
||||||
#include <linux/ceph/decode.h>
|
#include <linux/ceph/decode.h>
|
||||||
#include <linux/ceph/mon_client.h>
|
#include <linux/ceph/mon_client.h>
|
||||||
#include <linux/ceph/auth.h>
|
#include <linux/ceph/auth.h>
|
||||||
|
|
24
include/linux/ceph/ceph_features.h
Normal file
24
include/linux/ceph/ceph_features.h
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
#ifndef __CEPH_FEATURES
|
||||||
|
#define __CEPH_FEATURES
|
||||||
|
|
||||||
|
/*
|
||||||
|
* feature bits
|
||||||
|
*/
|
||||||
|
#define CEPH_FEATURE_UID (1<<0)
|
||||||
|
#define CEPH_FEATURE_NOSRCADDR (1<<1)
|
||||||
|
#define CEPH_FEATURE_MONCLOCKCHECK (1<<2)
|
||||||
|
#define CEPH_FEATURE_FLOCK (1<<3)
|
||||||
|
#define CEPH_FEATURE_SUBSCRIBE2 (1<<4)
|
||||||
|
#define CEPH_FEATURE_MONNAMES (1<<5)
|
||||||
|
#define CEPH_FEATURE_RECONNECT_SEQ (1<<6)
|
||||||
|
#define CEPH_FEATURE_DIRLAYOUTHASH (1<<7)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Features supported.
|
||||||
|
*/
|
||||||
|
#define CEPH_FEATURES_SUPPORTED_DEFAULT \
|
||||||
|
(CEPH_FEATURE_NOSRCADDR)
|
||||||
|
|
||||||
|
#define CEPH_FEATURES_REQUIRED_DEFAULT \
|
||||||
|
(CEPH_FEATURE_NOSRCADDR)
|
||||||
|
#endif
|
|
@ -35,20 +35,6 @@
|
||||||
/* arbitrary limit on max # of monitors (cluster of 3 is typical) */
|
/* arbitrary limit on max # of monitors (cluster of 3 is typical) */
|
||||||
#define CEPH_MAX_MON 31
|
#define CEPH_MAX_MON 31
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* feature bits
|
|
||||||
*/
|
|
||||||
#define CEPH_FEATURE_UID (1<<0)
|
|
||||||
#define CEPH_FEATURE_NOSRCADDR (1<<1)
|
|
||||||
#define CEPH_FEATURE_MONCLOCKCHECK (1<<2)
|
|
||||||
#define CEPH_FEATURE_FLOCK (1<<3)
|
|
||||||
#define CEPH_FEATURE_SUBSCRIBE2 (1<<4)
|
|
||||||
#define CEPH_FEATURE_MONNAMES (1<<5)
|
|
||||||
#define CEPH_FEATURE_RECONNECT_SEQ (1<<6)
|
|
||||||
#define CEPH_FEATURE_DIRLAYOUTHASH (1<<7)
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ceph_file_layout - describe data layout for a file/inode
|
* ceph_file_layout - describe data layout for a file/inode
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -22,12 +22,6 @@
|
||||||
#include "osd_client.h"
|
#include "osd_client.h"
|
||||||
#include "ceph_fs.h"
|
#include "ceph_fs.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* Supported features
|
|
||||||
*/
|
|
||||||
#define CEPH_FEATURE_SUPPORTED_DEFAULT CEPH_FEATURE_NOSRCADDR
|
|
||||||
#define CEPH_FEATURE_REQUIRED_DEFAULT CEPH_FEATURE_NOSRCADDR
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* mount options
|
* mount options
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
|
|
||||||
|
|
||||||
|
#include <linux/ceph/ceph_features.h>
|
||||||
#include <linux/ceph/libceph.h>
|
#include <linux/ceph/libceph.h>
|
||||||
#include <linux/ceph/debugfs.h>
|
#include <linux/ceph/debugfs.h>
|
||||||
#include <linux/ceph/decode.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->auth_err = 0;
|
||||||
|
|
||||||
client->extra_mon_dispatch = NULL;
|
client->extra_mon_dispatch = NULL;
|
||||||
client->supported_features = CEPH_FEATURE_SUPPORTED_DEFAULT |
|
client->supported_features = CEPH_FEATURES_SUPPORTED_DEFAULT |
|
||||||
supported_features;
|
supported_features;
|
||||||
client->required_features = CEPH_FEATURE_REQUIRED_DEFAULT |
|
client->required_features = CEPH_FEATURES_REQUIRED_DEFAULT |
|
||||||
required_features;
|
required_features;
|
||||||
|
|
||||||
/* msgr */
|
/* msgr */
|
||||||
|
|
Loading…
Reference in a new issue