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

Commit e4949e4b authored by Vasily Averin's avatar Vasily Averin Committed by Anna Schumaker
Browse files

nfs: remove net pointer from messages 



Publishing of net pointer is not safe,
use net->ns.inum instead

Signed-off-by: default avatarVasily Averin <vvs@virtuozzo.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 4112be70

fs/nfs/callback.c

+7 −7
Original line number Diff line number Diff line
@@ -48,15 +48,15 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) 
	if (ret <= 0)

		goto out_err;

	nn->nfs_callback_tcpport = ret;

	dprintk("NFS: Callback listener port = %u (af %u, net %p)\n",

			nn->nfs_callback_tcpport, PF_INET, net);

	dprintk("NFS: Callback listener port = %u (af %u, net %x)\n",

		nn->nfs_callback_tcpport, PF_INET, net->ns.inum);



	ret = svc_create_xprt(serv, "tcp", net, PF_INET6,

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

	if (ret > 0) {

		nn->nfs_callback_tcpport6 = ret;

		dprintk("NFS: Callback listener port = %u (af %u, net %p)\n",

				nn->nfs_callback_tcpport6, PF_INET6, net);

		dprintk("NFS: Callback listener port = %u (af %u, net %x\n",

			nn->nfs_callback_tcpport6, PF_INET6, net->ns.inum);

	} else if (ret != -EAFNOSUPPORT)

		goto out_err;

	return 0;
@@ -184,7 +184,7 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc 
	if (--nn->cb_users[minorversion])

		return;



	dprintk("NFS: destroy per-net callback data; net=%p\n", net);

	dprintk("NFS: destroy per-net callback data; net=%x\n", net->ns.inum);

	svc_shutdown_net(serv, net);

}
@@ -197,7 +197,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, 
	if (nn->cb_users[minorversion]++)

		return 0;



	dprintk("NFS: create per-net callback data; net=%p\n", net);

	dprintk("NFS: create per-net callback data; net=%x\n", net->ns.inum);



	ret = svc_bind(serv, net);

	if (ret < 0) {
@@ -222,7 +222,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, 
err_bind:

	nn->cb_users[minorversion]--;

	dprintk("NFS: Couldn't create callback socket: err = %d; "

			"net = %p\n", ret, net);

			"net = %x\n", ret, net->ns.inum);

	return ret;

}