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

Commit 12b4629a authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: all features fields must be u64 



In preparation for ceph_features.h update, change all features fields
from unsigned int/u32 to u64.  (ceph.git has ~40 feature bits at this
point.)

Signed-off-by: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent e37180c0

fs/ceph/mds_client.c

+7 −7
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static const struct ceph_connection_operations mds_con_ops; 
 */

static int parse_reply_info_in(void **p, void *end,

			       struct ceph_mds_reply_info_in *info,

			       int features)

			       u64 features)

{

	int err = -EIO;
@@ -98,7 +98,7 @@ static int parse_reply_info_in(void **p, void *end, 
 */

static int parse_reply_info_trace(void **p, void *end,

				  struct ceph_mds_reply_info_parsed *info,

				  int features)

				  u64 features)

{

	int err;
@@ -145,7 +145,7 @@ static int parse_reply_info_trace(void **p, void *end, 
 */

static int parse_reply_info_dir(void **p, void *end,

				struct ceph_mds_reply_info_parsed *info,

				int features)

				u64 features)

{

	u32 num, i = 0;

	int err;
@@ -217,7 +217,7 @@ static int parse_reply_info_dir(void **p, void *end, 
 */

static int parse_reply_info_filelock(void **p, void *end,

				     struct ceph_mds_reply_info_parsed *info,

				     int features)

				     u64 features)

{

	if (*p + sizeof(*info->filelock_reply) > end)

		goto bad;
@@ -238,7 +238,7 @@ static int parse_reply_info_filelock(void **p, void *end, 
 */

static int parse_reply_info_create(void **p, void *end,

				  struct ceph_mds_reply_info_parsed *info,

				  int features)

				  u64 features)

{

	if (features & CEPH_FEATURE_REPLY_CREATE_INODE) {

		if (*p == end) {
@@ -262,7 +262,7 @@ static int parse_reply_info_create(void **p, void *end, 
 */

static int parse_reply_info_extra(void **p, void *end,

				  struct ceph_mds_reply_info_parsed *info,

				  int features)

				  u64 features)

{

	if (info->head->op == CEPH_MDS_OP_GETFILELOCK)

		return parse_reply_info_filelock(p, end, info, features);
@@ -280,7 +280,7 @@ static int parse_reply_info_extra(void **p, void *end, 
 */

static int parse_reply_info(struct ceph_msg *msg,

			    struct ceph_mds_reply_info_parsed *info,

			    int features)

			    u64 features)

{

	void *p, *end;

	u32 len;

fs/ceph/super.c

+2 −2
Original line number Diff line number Diff line
@@ -490,10 +490,10 @@ static struct ceph_fs_client *create_fs_client(struct ceph_mount_options *fsopt, 
					struct ceph_options *opt)

{

	struct ceph_fs_client *fsc;

	const unsigned supported_features =

	const u64 supported_features =

		CEPH_FEATURE_FLOCK |

		CEPH_FEATURE_DIRLAYOUTHASH;

	const unsigned required_features = 0;

	const u64 required_features = 0;

	int page_count;

	size_t size;

	int err = -ENOMEM;

include/linux/ceph/libceph.h

+4 −4
Original line number Diff line number Diff line
@@ -122,8 +122,8 @@ struct ceph_client { 


	int (*extra_mon_dispatch)(struct ceph_client *, struct ceph_msg *);



	u32 supported_features;

	u32 required_features;

	u64 supported_features;

	u64 required_features;



	struct ceph_messenger msgr;   /* messenger instance */

	struct ceph_mon_client monc;
@@ -192,8 +192,8 @@ extern int ceph_compare_options(struct ceph_options *new_opt, 
				struct ceph_client *client);

extern struct ceph_client *ceph_create_client(struct ceph_options *opt,

					      void *private,

					      unsigned supported_features,

					      unsigned required_features);

					      u64 supported_features,

					      u64 required_features);

extern u64 ceph_client_id(struct ceph_client *client);

extern void ceph_destroy_client(struct ceph_client *client);

extern int __ceph_open_session(struct ceph_client *client,

include/linux/ceph/messenger.h

+5 −5
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ struct ceph_messenger { 
	u32 global_seq;

	spinlock_t global_seq_lock;



	u32 supported_features;

	u32 required_features;

	u64 supported_features;

	u64 required_features;

};



enum ceph_msg_data_type {
@@ -192,7 +192,7 @@ struct ceph_connection { 


	struct ceph_entity_name peer_name; /* peer name */



	unsigned peer_features;

	u64 peer_features;

	u32 connect_seq;      /* identify the most recent connection

				 attempt for this connection, client */

	u32 peer_global_seq;  /* peer's global seq for this connection */
@@ -256,8 +256,8 @@ extern void ceph_msgr_flush(void); 


extern void ceph_messenger_init(struct ceph_messenger *msgr,

			struct ceph_entity_addr *myaddr,

			u32 supported_features,

			u32 required_features,

			u64 supported_features,

			u64 required_features,

			bool nocrc);



extern void ceph_con_init(struct ceph_connection *con, void *private,

net/ceph/ceph_common.c

+2 −2
Original line number Diff line number Diff line
@@ -461,8 +461,8 @@ EXPORT_SYMBOL(ceph_client_id); 
 * create a fresh client instance

 */

struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private,

				       unsigned int supported_features,

				       unsigned int required_features)

				       u64 supported_features,

				       u64 required_features)

{

	struct ceph_client *client;

	struct ceph_entity_addr *myaddr = NULL;