From 3bb782754ec3cac26d792a2141f2cd6cb217ab72 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 7 Jul 2010 09:06:08 -0700 Subject: [PATCH] --- yaml --- r: 208844 b: refs/heads/master c: 6a2593823ababdada2636398ac190931517b51cf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ceph/messenger.c | 6 +++--- trunk/fs/ceph/super.h | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5523161d863c..b56a9973173d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c309f0ab26ca37663f368918553d02e90356c89d +refs/heads/master: 6a2593823ababdada2636398ac190931517b51cf diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c index 71263a2a78d7..79b0995dc825 100644 --- a/trunk/fs/ceph/messenger.c +++ b/trunk/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/trunk/fs/ceph/super.h b/trunk/fs/ceph/super.h index 8ceb62380d3f..af62081a9535 100644 --- a/trunk/fs/ceph/super.h +++ b/trunk/fs/ceph/super.h @@ -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 */