Commit 6a259382 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: specify supported features in super.h 



Specify the supported/required feature bits in super.h client code instead
of using the definitions from the shared kernel/userspace headers (which
will go away shortly).

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent c309f0ab

fs/ceph/messenger.c

+3 −3
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static void prepare_write_connect(struct ceph_messenger *msgr, 
	dout("prepare_write_connect %p cseq=%d gseq=%d proto=%d\n", con,

	     con->connect_seq, global_seq, proto);



	con->out_connect.features = cpu_to_le64(CEPH_FEATURE_SUPPORTED_CLIENT);

	con->out_connect.features = cpu_to_le64(CEPH_FEATURE_SUPPORTED);

	con->out_connect.host_type = cpu_to_le32(CEPH_ENTITY_TYPE_CLIENT);

	con->out_connect.connect_seq = cpu_to_le32(con->connect_seq);

	con->out_connect.global_seq = cpu_to_le32(global_seq);
@@ -1123,8 +1123,8 @@ static void fail_protocol(struct ceph_connection *con) 


static int process_connect(struct ceph_connection *con)

{

	u64 sup_feat = CEPH_FEATURE_SUPPORTED_CLIENT;

	u64 req_feat = CEPH_FEATURE_REQUIRED_CLIENT;

	u64 sup_feat = CEPH_FEATURE_SUPPORTED;

	u64 req_feat = CEPH_FEATURE_REQUIRED;

	u64 server_feat = le64_to_cpu(con->in_reply.features);



	dout("process_connect on %p tag %d\n", con, (int)con->in_tag);

fs/ceph/super.h

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,12 @@ 
#define CEPH_BLOCK_SHIFT   20  /* 1 MB */

#define CEPH_BLOCK         (1 << CEPH_BLOCK_SHIFT)



/*

 * Supported features

 */

#define CEPH_FEATURE_SUPPORTED CEPH_FEATURE_NOSRCADDR

#define CEPH_FEATURE_REQUIRED  CEPH_FEATURE_NOSRCADDR



/*

 * mount options

 */