Attachment 940590 Details for Bug 1120850 – statd_port_change_recovery.patch

[patch] statd_port_change_recovery.patch

statd_port_change_recovery.patch (text/plain), 1.91 KB, created by Benjamin Coddington on 2014-09-23 19:41:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Coddington

Created: 2014-09-23 19:41:13 UTC

Size: 1.91 KB

patch

obsolete

>diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
>index 1812f02..6ae664b 100644
>--- a/fs/lockd/mon.c
>+++ b/fs/lockd/mon.c
>@@ -159,6 +159,12 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res,
> 
> 	msg.rpc_proc = &clnt->cl_procinfo[proc];
> 	status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFTCONN);
>+	if (status == -ECONNREFUSED) {
>+		dprintk("lockd:	NSM upcall RPC failed, status=%d, forcing rebind\n",
>+				status);
>+		rpc_force_rebind(clnt);
>+		status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFTCONN);
>+	}
> 	if (status < 0)
> 		dprintk("lockd: NSM upcall RPC failed, status=%d\n",
> 				status);
>diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
>index 5903d2c..407f0bd 100644
>--- a/include/linux/sunrpc/xprt.h
>+++ b/include/linux/sunrpc/xprt.h
>@@ -357,6 +357,7 @@ int			xs_swapper(struct rpc_xprt *xprt, int enable);
> #define XPRT_CONNECTION_ABORT	(7)
> #define XPRT_CONNECTION_CLOSE	(8)
> #define XPRT_CONGESTED		(9)
>+#define XPRT_CONNECTION_REUSE	(10)
> 
> static inline void xprt_set_connected(struct rpc_xprt *xprt)
> {
>diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
>index 3d85759..56c67cf 100644
>--- a/net/sunrpc/xprtsock.c
>+++ b/net/sunrpc/xprtsock.c
>@@ -842,6 +842,8 @@ static void xs_error_report(struct sock *sk)
> 	dprintk("RPC:       xs_error_report client %p, error=%d...\n",
> 			xprt, -err);
> 	trace_rpc_socket_error(xprt, sk->sk_socket, err);
>+	if (test_bit(XPRT_CONNECTION_REUSE, &xprt->state))
>+		goto out;
> 	xprt_wake_pending_tasks(xprt, err);
>  out:
> 	read_unlock_bh(&sk->sk_callback_lock);
>@@ -2244,7 +2246,9 @@ static void xs_tcp_setup_socket(struct work_struct *work)
> 		abort_and_exit = test_and_clear_bit(XPRT_CONNECTION_ABORT,
> 				&xprt->state);
> 		/* "close" the socket, preserving the local port */
>+		set_bit(XPRT_CONNECTION_REUSE, &xprt->state);
> 		xs_tcp_reuse_connection(transport);
>+		clear_bit(XPRT_CONNECTION_REUSE, &xprt->state);
> 
> 		if (abort_and_exit)
> 			goto out_eagain;

Actions: View | Diff

Attachments on bug 1120850: 928949 | 932433 | 939392 | 940590