Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fe60e51 authored by Sage Weil's avatar Sage Weil
Browse files

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: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarYehuda Sadeh <yehuda@inktank.com>
parent d1f57ea6

fs/ceph/mds_client.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "super.h"

#include "mds_client.h"



#include <linux/ceph/ceph_features.h>

#include <linux/ceph/messenger.h>

#include <linux/ceph/decode.h>

#include <linux/ceph/pagelist.h>

fs/ceph/super.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "super.h"

#include "mds_client.h"



#include <linux/ceph/ceph_features.h>

#include <linux/ceph/decode.h>

#include <linux/ceph/mon_client.h>

#include <linux/ceph/auth.h>

include/linux/ceph/ceph_features.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#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

include/linux/ceph/ceph_fs.h

+0 −14
Original line number Diff line number Diff line
@@ -35,20 +35,6 @@ 
/* arbitrary limit on max # of monitors (cluster of 3 is typical) */

#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

 */

include/linux/ceph/libceph.h

+0 −6
Original line number Diff line number Diff line
@@ -22,12 +22,6 @@ 
#include "osd_client.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

 */