diff options
| author | David Howells <dhowells@redhat.com> | 2017-11-02 18:27:47 +0300 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-11-13 18:38:17 +0300 |
| commit | 4d9df9868f31df6725481135c10ac6419ce58d44 (patch) | |
| tree | c4fcbe437438c940485d438ad5c5871ab20d3288 /fs/afs/volume.c | |
| parent | ad6a942a9e74edea8a4a126a1e434feff6a6d5c2 (diff) | |
| download | linux-4d9df9868f31df6725481135c10ac6419ce58d44.tar.xz | |
afs: Keep and pass sockaddr_rxrpc addresses rather than in_addr
Keep and pass sockaddr_rxrpc addresses around rather than keeping and
passing in_addr addresses to allow for the use of IPv6 and non-standard
port numbers in future.
This also allows the port and service_id fields to be removed from the
afs_call struct.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'fs/afs/volume.c')
| -rw-r--r-- | fs/afs/volume.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/afs/volume.c b/fs/afs/volume.c index ccac5b1e079d..52f0dc40732b 100644 --- a/fs/afs/volume.c +++ b/fs/afs/volume.c @@ -248,8 +248,8 @@ struct afs_server *afs_volume_pick_fileserver(struct afs_vnode *vnode) case 0: afs_get_server(server); up_read(&volume->server_sem); - _leave(" = %p (picked %08x)", - server, ntohl(server->addr.s_addr)); + _leave(" = %p (picked %pIS)", + server, &server->addr.transport); return server; case -ENETUNREACH: @@ -303,9 +303,8 @@ int afs_volume_release_fileserver(struct afs_vnode *vnode, struct afs_volume *volume = vnode->volume; unsigned loop; - _enter("%s,%08x,%d", - volume->vlocation->vldb.name, ntohl(server->addr.s_addr), - result); + _enter("%s,%pIS,%d", + volume->vlocation->vldb.name, &server->addr.transport, result); switch (result) { /* success */ |