Commit b726ec97 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

libceph: make ceph_pr_addr take an struct ceph_entity_addr pointer 



GCC9 is throwing a lot of warnings about unaligned accesses by
callers of ceph_pr_addr. All of the current callers are passing a
pointer to the sockaddr inside struct ceph_entity_addr.

Fix it to take a pointer to a struct ceph_entity_addr instead,
and then have the function make a copy of the sockaddr before
printing it.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent cede185b

fs/ceph/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int mdsmap_show(struct seq_file *s, void *p) 
		struct ceph_entity_addr *addr = &mdsmap->m_info[i].addr;

		int state = mdsmap->m_info[i].state;

		seq_printf(s, "\tmds%d\t%s\t(%s)\n", i,

			       ceph_pr_addr(&addr->in_addr),

			       ceph_pr_addr(addr),

			       ceph_mds_state_name(state));

	}

	return 0;

fs/ceph/mdsmap.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) 


		dout("mdsmap_decode %d/%d %lld mds%d.%d %s %s\n",

		     i+1, n, global_id, mds, inc,

		     ceph_pr_addr(&addr.in_addr),

		     ceph_pr_addr(&addr),

		     ceph_mds_state_name(state));



		if (mds < 0 || state <= 0)

include/linux/ceph/messenger.h

+2 −1
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ struct ceph_connection { 
};





extern const char *ceph_pr_addr(const struct sockaddr_storage *ss);

extern const char *ceph_pr_addr(const struct ceph_entity_addr *addr);



extern int ceph_parse_ips(const char *c, const char *end,

			  struct ceph_entity_addr *addr,

			  int max_count, int *count);

net/ceph/cls_lock_client.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static int decode_locker(void **p, void *end, struct ceph_locker *locker) 


	dout("%s %s%llu cookie %s addr %s\n", __func__,

	     ENTITY_NAME(locker->id.name), locker->id.cookie,

	     ceph_pr_addr(&locker->info.addr.in_addr));

	     ceph_pr_addr(&locker->info.addr));

	return 0;

}

net/ceph/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int monmap_show(struct seq_file *s, void *p) 


		seq_printf(s, "\t%s%lld\t%s\n",

			   ENTITY_NAME(inst->name),

			   ceph_pr_addr(&inst->addr.in_addr));

			   ceph_pr_addr(&inst->addr));

	}

	return 0;

}
@@ -82,7 +82,7 @@ static int osdmap_show(struct seq_file *s, void *p) 
		char sb[64];



		seq_printf(s, "osd%d\t%s\t%3d%%\t(%s)\t%3d%%\n",

			   i, ceph_pr_addr(&addr->in_addr),

			   i, ceph_pr_addr(addr),

			   ((map->osd_weight[i]*100) >> 16),

			   ceph_osdmap_state_str(sb, sizeof(sb), state),

			   ((ceph_get_primary_affinity(map, i)*100) >> 16));