From: Alex Elder <elder@inktank.com>
To: Sage Weil <sage@inktank.com>
Cc: ceph-devel@vger.kernel.org
Subject: Re: [PATCH 1/9] libceph: move feature bits to separate header
Date: Mon, 30 Jul 2012 13:29:48 -0500 [thread overview]
Message-ID: <5016D29C.8010108@inktank.com> (raw)
In-Reply-To: <1342831308-18815-2-git-send-email-sage@inktank.com>
On 07/20/2012 07:41 PM, Sage Weil wrote:
> This is simply cleanup that will keep things more closely synced with the
> userland code.
>
> Signed-off-by: Sage Weil <sage@inktank.com>
Looks good.
Reviewed-by: Alex Elder <elder@inktank.com>
> ---
> fs/ceph/mds_client.c | 1 +
> fs/ceph/super.c | 1 +
> include/linux/ceph/ceph_features.h | 24 ++++++++++++++++++++++++
> include/linux/ceph/ceph_fs.h | 14 --------------
> include/linux/ceph/libceph.h | 6 ------
> net/ceph/ceph_common.c | 5 +++--
> 6 files changed, 29 insertions(+), 22 deletions(-)
> create mode 100644 include/linux/ceph/ceph_features.h
>
> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
> index 418f6a8..39b76d6 100644
> --- a/fs/ceph/mds_client.c
> +++ b/fs/ceph/mds_client.c
> @@ -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>
> diff --git a/fs/ceph/super.c b/fs/ceph/super.c
> index 1e67dd7..2c47ecf 100644
> --- a/fs/ceph/super.c
> +++ b/fs/ceph/super.c
> @@ -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>
> diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h
> new file mode 100644
> index 0000000..342f93d
> --- /dev/null
> +++ b/include/linux/ceph/ceph_features.h
> @@ -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
> diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
> index e81ab30..d021610 100644
> --- a/include/linux/ceph/ceph_fs.h
> +++ b/include/linux/ceph/ceph_fs.h
> @@ -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
> */
> diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
> index 98ec36a..ea072e1 100644
> --- a/include/linux/ceph/libceph.h
> +++ b/include/linux/ceph/libceph.h
> @@ -23,12 +23,6 @@
> #include "ceph_fs.h"
>
> /*
> - * Supported features
> - */
> -#define CEPH_FEATURE_SUPPORTED_DEFAULT CEPH_FEATURE_NOSRCADDR
> -#define CEPH_FEATURE_REQUIRED_DEFAULT CEPH_FEATURE_NOSRCADDR
> -
> -/*
> * mount options
> */
> #define CEPH_OPT_FSID (1<<0)
> diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
> index 3b45e01..69e38db 100644
> --- a/net/ceph/ceph_common.c
> +++ b/net/ceph/ceph_common.c
> @@ -17,6 +17,7 @@
> #include <linux/string.h>
>
>
> +#include <linux/ceph/ceph_features.h>
> #include <linux/ceph/libceph.h>
> #include <linux/ceph/debugfs.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->extra_mon_dispatch = NULL;
> - client->supported_features = CEPH_FEATURE_SUPPORTED_DEFAULT |
> + client->supported_features = CEPH_FEATURES_SUPPORTED_DEFAULT |
> supported_features;
> - client->required_features = CEPH_FEATURE_REQUIRED_DEFAULT |
> + client->required_features = CEPH_FEATURES_REQUIRED_DEFAULT |
> required_features;
>
> /* msgr */
>
next prev parent reply other threads:[~2012-07-30 18:29 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-21 0:41 [PATCH 0/9] messenger fixups, batch #1 Sage Weil
2012-07-21 0:41 ` [PATCH 1/9] libceph: move feature bits to separate header Sage Weil
2012-07-24 22:14 ` Yehuda Sadeh
2012-07-30 18:29 ` Alex Elder [this message]
2012-07-21 0:41 ` [PATCH 2/9] libceph: support crush tunables Sage Weil
2012-07-24 22:24 ` Yehuda Sadeh
2012-07-30 23:14 ` Sage Weil
2012-07-30 23:45 ` Yehuda Sadeh
2012-07-30 18:36 ` Alex Elder
2012-07-21 0:41 ` [PATCH 3/9] libceph: report socket read/write error message Sage Weil
2012-07-24 22:26 ` Yehuda Sadeh
2012-07-30 18:37 ` Alex Elder
2012-07-21 0:41 ` [PATCH 4/9] libceph: fix mutex coverage for ceph_con_close Sage Weil
2012-07-24 22:29 ` Yehuda Sadeh
2012-07-30 18:43 ` Alex Elder
2012-07-21 0:41 ` [PATCH 5/9] libceph: resubmit linger ops when pg mapping changes Sage Weil
2012-07-24 22:51 ` Yehuda Sadeh
2012-07-30 22:40 ` Alex Elder
2012-07-30 23:03 ` Sage Weil
2012-07-21 0:41 ` [PATCH 6/9] libceph: (re)initialize bio_iter on start of message receive Sage Weil
2012-07-24 22:55 ` Yehuda Sadeh
2012-07-30 19:04 ` Alex Elder
2012-07-21 0:41 ` [PATCH 7/9] ceph: close old con before reopening on mds reconnect Sage Weil
2012-07-24 22:56 ` Yehuda Sadeh
2012-07-30 23:11 ` Sage Weil
2012-07-21 0:41 ` [PATCH 8/9] libceph: protect ceph_con_open() with mutex Sage Weil
2012-07-24 22:58 ` Yehuda Sadeh
2012-07-30 19:06 ` Alex Elder
2012-07-21 0:41 ` [PATCH 9/9] libceph: reset connection retry on successfully negotiation Sage Weil
2012-07-24 23:00 ` Yehuda Sadeh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5016D29C.8010108@inktank.com \
--to=elder@inktank.com \
--cc=ceph-devel@vger.kernel.org \
--cc=sage@inktank.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox