diff options
| author | Sage Weil <sage@newdream.net> | 2010-07-07 09:06:08 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-08-01 20:11:41 -0700 |
| commit | 6a2593823ababdada2636398ac190931517b51cf (patch) | |
| tree | 7557b08cc90aa0d2c70ea5b0e6b22ff64a4c235d | |
| parent | c309f0ab26ca37663f368918553d02e90356c89d (diff) | |
| download | linux-3.10-6a2593823ababdada2636398ac190931517b51cf.tar.gz linux-3.10-6a2593823ababdada2636398ac190931517b51cf.tar.bz2 linux-3.10-6a2593823ababdada2636398ac190931517b51cf.zip | |
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: Sage Weil <sage@newdream.net>
| -rw-r--r-- | fs/ceph/messenger.c | 6 | ||||
| -rw-r--r-- | fs/ceph/super.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c index 71263a2a78d..79b0995dc82 100644 --- a/fs/ceph/messenger.c +++ b/fs/ceph/messenger.c @@ -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); diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 8ceb62380d3..af62081a953 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -31,6 +31,12 @@ #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 */ #define CEPH_OPT_FSID (1<<0) |