diff options
Diffstat (limited to 'fs/nfs/callback.c')
-rw-r--r-- | fs/nfs/callback.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index cd9d992feb2e..509dc5adeb8f 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c | |||
@@ -49,15 +49,15 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) | |||
49 | if (ret <= 0) | 49 | if (ret <= 0) |
50 | goto out_err; | 50 | goto out_err; |
51 | nn->nfs_callback_tcpport = ret; | 51 | nn->nfs_callback_tcpport = ret; |
52 | dprintk("NFS: Callback listener port = %u (af %u, net %p)\n", | 52 | dprintk("NFS: Callback listener port = %u (af %u, net %x)\n", |
53 | nn->nfs_callback_tcpport, PF_INET, net); | 53 | nn->nfs_callback_tcpport, PF_INET, net->ns.inum); |
54 | 54 | ||
55 | ret = svc_create_xprt(serv, "tcp", net, PF_INET6, | 55 | ret = svc_create_xprt(serv, "tcp", net, PF_INET6, |
56 | nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS); | 56 | nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS); |
57 | if (ret > 0) { | 57 | if (ret > 0) { |
58 | nn->nfs_callback_tcpport6 = ret; | 58 | nn->nfs_callback_tcpport6 = ret; |
59 | dprintk("NFS: Callback listener port = %u (af %u, net %p)\n", | 59 | dprintk("NFS: Callback listener port = %u (af %u, net %x\n", |
60 | nn->nfs_callback_tcpport6, PF_INET6, net); | 60 | nn->nfs_callback_tcpport6, PF_INET6, net->ns.inum); |
61 | } else if (ret != -EAFNOSUPPORT) | 61 | } else if (ret != -EAFNOSUPPORT) |
62 | goto out_err; | 62 | goto out_err; |
63 | return 0; | 63 | return 0; |
@@ -185,7 +185,7 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc | |||
185 | if (--nn->cb_users[minorversion]) | 185 | if (--nn->cb_users[minorversion]) |
186 | return; | 186 | return; |
187 | 187 | ||
188 | dprintk("NFS: destroy per-net callback data; net=%p\n", net); | 188 | dprintk("NFS: destroy per-net callback data; net=%x\n", net->ns.inum); |
189 | svc_shutdown_net(serv, net); | 189 | svc_shutdown_net(serv, net); |
190 | } | 190 | } |
191 | 191 | ||
@@ -198,7 +198,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, | |||
198 | if (nn->cb_users[minorversion]++) | 198 | if (nn->cb_users[minorversion]++) |
199 | return 0; | 199 | return 0; |
200 | 200 | ||
201 | dprintk("NFS: create per-net callback data; net=%p\n", net); | 201 | dprintk("NFS: create per-net callback data; net=%x\n", net->ns.inum); |
202 | 202 | ||
203 | ret = svc_bind(serv, net); | 203 | ret = svc_bind(serv, net); |
204 | if (ret < 0) { | 204 | if (ret < 0) { |
@@ -223,7 +223,7 @@ err_socks: | |||
223 | err_bind: | 223 | err_bind: |
224 | nn->cb_users[minorversion]--; | 224 | nn->cb_users[minorversion]--; |
225 | dprintk("NFS: Couldn't create callback socket: err = %d; " | 225 | dprintk("NFS: Couldn't create callback socket: err = %d; " |
226 | "net = %p\n", ret, net); | 226 | "net = %x\n", ret, net->ns.inum); |
227 | return ret; | 227 | return ret; |
228 | } | 228 | } |
229 | 229 | ||