[PATCH 0/3] SUNPRC: redundant XPT_CHNGBUF set removed

[PATCH 0/3] SUNPRC: redundant XPT_CHNGBUF set removed

[Stanislav Kinsbursky]

This is a cleanup path set

The following series consists of:

---

Stanislav Kinsbursky (3):
      SUNPRC: remove marking service temporary sockets with XPT_CHNGBUF
      Lockd: don't mark freshly created sockets with XPT_CHNGBUF
      NFS: don't mark freshly created callback sockets with XPT_CHNGBUF


 fs/lockd/svc.c       |    1 -
 fs/nfs/callback.c    |    2 --
 net/sunrpc/svcsock.c |    2 --
 3 files changed, 0 insertions(+), 5 deletions(-)

-- 
Signature

[PATCH 1/3] SUNPRC: remove marking service temporary sockets with XPT_CHNGBUF

[Stanislav Kinsbursky]

This is a cleanup patch.
Temporary sockets can be TCP only. But XPT_CHNGBUF service socket flag is
checked only for UDP sockets on receive.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>

---
 net/sunrpc/svcsock.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 110735f..72b05f2 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1381,8 +1381,6 @@ void svc_sock_update_bufs(struct svc_serv *serv)
 	spin_lock_bh(&serv->sv_lock);
 	list_for_each_entry(svsk, &serv->sv_permsocks, sk_xprt.xpt_list)
 		set_bit(XPT_CHNGBUF, &svsk->sk_xprt.xpt_flags);
-	list_for_each_entry(svsk, &serv->sv_tempsocks, sk_xprt.xpt_list)
-		set_bit(XPT_CHNGBUF, &svsk->sk_xprt.xpt_flags);
 	spin_unlock_bh(&serv->sv_lock);
 }
 EXPORT_SYMBOL_GPL(svc_sock_update_bufs);

[PATCH 2/3] Lockd: don't mark freshly created sockets with XPT_CHNGBUF

[Stanislav Kinsbursky]

This is a cleanup patch. XPT_CHNGBUF bit is set on UDP socket creation. Calling
svc_sock_update_bufs from lockd after is redundant.
Below is Lockd UDP sockets creating call trace:

lockd_up {

make_socks
create_lockd_family
create_lockd_listener
svc_create_xprt
__svc_xpo_create
svc_udp_create
svc_create_socket
svc_setup_socket
svc_udp_init (raise XPT_CHNGBUF)

....

svc_sock_update_bufs (raise XPT_CHNGBUF again)

....

}

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>

---
 fs/lockd/svc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index ff379ff..55fea92 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -292,7 +292,6 @@ int lockd_up(void)
 		goto destroy_and_out;
 	}
 
-	svc_sock_update_bufs(serv);
 	serv->sv_maxconn = nlm_max_connections;
 
 	nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, serv->sv_name);

[PATCH 3/3] NFS: don't mark freshly created callback sockets with XPT_CHNGBUF

[Stanislav Kinsbursky]

This is a cleanup patch.
Check for XPT_CHNGBUF is done only for UPD sockets. NFS callbacks doesn't use
them.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>

---
 fs/nfs/callback.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index d81040a..1bf3e9f 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -278,8 +278,6 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 		goto out_err;
 	}
 
-	svc_sock_update_bufs(serv);
-
 	sprintf(svc_name, "nfsv4.%u-svc", minorversion);
 	cb_info->serv = serv;
 	cb_info->rqst = rqstp;