Commit 07f3502b authored by David Howells's avatar David Howells
Browse files

afs: Turn the afs_addr_list address array into an array of structs 



Turn the afs_addr_list address array into an array of structs, thereby
allowing per-address (such as RTT) info to be added.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
parent fe245c8f

fs/afs/addr_list.c

+5 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct afs_addr_list *afs_alloc_addrlist(unsigned int nr, 
	alist->max_addrs = nr;



	for (i = 0; i < nr; i++) {

		struct sockaddr_rxrpc *srx = &alist->addrs[i];

		struct sockaddr_rxrpc *srx = &alist->addrs[i].srx;

		srx->srx_family			= AF_RXRPC;

		srx->srx_service		= service;

		srx->transport_type		= SOCK_DGRAM;
@@ -281,7 +281,7 @@ void afs_merge_fs_addr4(struct afs_addr_list *alist, __be32 xdr, u16 port) 
		return;



	for (i = 0; i < alist->nr_ipv4; i++) {

		struct sockaddr_in *a = &alist->addrs[i].transport.sin;

		struct sockaddr_in *a = &alist->addrs[i].srx.transport.sin;

		u32 a_addr = ntohl(a->sin_addr.s_addr);

		u16 a_port = ntohs(a->sin_port);
@@ -298,7 +298,7 @@ void afs_merge_fs_addr4(struct afs_addr_list *alist, __be32 xdr, u16 port) 
			alist->addrs + i,

			sizeof(alist->addrs[0]) * (alist->nr_addrs - i));



	srx = &alist->addrs[i];

	srx = &alist->addrs[i].srx;

	srx->srx_family = AF_RXRPC;

	srx->transport_type = SOCK_DGRAM;

	srx->transport_len = sizeof(srx->transport.sin);
@@ -321,7 +321,7 @@ void afs_merge_fs_addr6(struct afs_addr_list *alist, __be32 *xdr, u16 port) 
		return;



	for (i = alist->nr_ipv4; i < alist->nr_addrs; i++) {

		struct sockaddr_in6 *a = &alist->addrs[i].transport.sin6;

		struct sockaddr_in6 *a = &alist->addrs[i].srx.transport.sin6;

		u16 a_port = ntohs(a->sin6_port);



		diff = memcmp(xdr, &a->sin6_addr, 16);
@@ -338,7 +338,7 @@ void afs_merge_fs_addr6(struct afs_addr_list *alist, __be32 *xdr, u16 port) 
			alist->addrs + i,

			sizeof(alist->addrs[0]) * (alist->nr_addrs - i));



	srx = &alist->addrs[i];

	srx = &alist->addrs[i].srx;

	srx->srx_family = AF_RXRPC;

	srx->transport_type = SOCK_DGRAM;

	srx->transport_len = sizeof(srx->transport.sin6);

fs/afs/fs_probe.c

+3 −3
Original line number Diff line number Diff line
@@ -153,12 +153,12 @@ void afs_fileserver_probe_result(struct afs_call *call) 
	if (call->service_id == YFS_FS_SERVICE) {

		server->probe.is_yfs = true;

		set_bit(AFS_SERVER_FL_IS_YFS, &server->flags);

		alist->addrs[index].srx_service = call->service_id;

		alist->addrs[index].srx.srx_service = call->service_id;

	} else {

		server->probe.not_yfs = true;

		if (!server->probe.is_yfs) {

			clear_bit(AFS_SERVER_FL_IS_YFS, &server->flags);

			alist->addrs[index].srx_service = call->service_id;

			alist->addrs[index].srx.srx_service = call->service_id;

		}

		cap0 = ntohl(call->tmp);

		if (cap0 & AFS3_VICED_CAPABILITY_64BITFILES)
@@ -182,7 +182,7 @@ void afs_fileserver_probe_result(struct afs_call *call) 
	spin_unlock(&server->probe_lock);



	_debug("probe %pU [%u] %pISpc rtt=%u ret=%d",

	       &server->uuid, index, &alist->addrs[index].transport,

	       &server->uuid, index, &alist->addrs[index].srx.transport,

	       rtt_us, ret);



	return afs_done_one_fs_probe(call->net, server);

fs/afs/internal.h

+5 −1
Original line number Diff line number Diff line
@@ -87,7 +87,9 @@ struct afs_addr_list { 
	enum dns_lookup_status	status:8;

	unsigned long		failed;		/* Mask of addrs that failed locally/ICMP */

	unsigned long		responded;	/* Mask of addrs that responded */

	struct sockaddr_rxrpc	addrs[] __counted_by(max_addrs);

	struct {

		struct sockaddr_rxrpc	srx;

	} addrs[] __counted_by(max_addrs);

#define AFS_MAX_ADDRESSES ((unsigned int)(sizeof(unsigned long) * 8))

};
@@ -969,6 +971,8 @@ extern void afs_put_addrlist(struct afs_addr_list *); 
extern struct afs_vlserver_list *afs_parse_text_addrs(struct afs_net *,

						      const char *, size_t, char,

						      unsigned short, unsigned short);

bool afs_addr_list_same(const struct afs_addr_list *a,

			const struct afs_addr_list *b);

extern struct afs_vlserver_list *afs_dns_query(struct afs_cell *, time64_t *);

extern bool afs_iterate_addresses(struct afs_addr_cursor *);

extern int afs_end_cursor(struct afs_addr_cursor *);

fs/afs/proc.c

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v) 
		for (i = 0; i < alist->nr_addrs; i++)

			seq_printf(m, " %c %pISpc\n",

				   alist->preferred == i ? '>' : '-',

				   &alist->addrs[i].transport);

				   &alist->addrs[i].srx.transport);

	}

	seq_printf(m, " info: fl=%lx rtt=%d\n", vlserver->flags, vlserver->rtt);

	seq_printf(m, " probe: fl=%x e=%d ac=%d out=%d\n",
@@ -399,7 +399,7 @@ static int afs_proc_servers_show(struct seq_file *m, void *v) 
		   alist->version, alist->responded, alist->failed);

	for (i = 0; i < alist->nr_addrs; i++)

		seq_printf(m, "    [%x] %pISpc%s\n",

			   i, &alist->addrs[i].transport,

			   i, &alist->addrs[i].srx.transport,

			   alist->preferred == i ? "*" : "");

	return 0;

}

fs/afs/rotate.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ bool afs_select_fileserver(struct afs_operation *op) 


	_debug("address [%u] %u/%u %pISp",

	       op->index, op->ac.index, op->ac.alist->nr_addrs,

	       &op->ac.alist->addrs[op->ac.index].transport);

	       &op->ac.alist->addrs[op->ac.index].srx.transport);



	_leave(" = t");

	return true;