Commit a9ca4043 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

Merge Trond's bugfixes 

Merge branch 'bugfixes' of git://linux-nfs.org/~trondmy/nfs-2.6 into
for-3.7-incoming.  Mainly needed for Bryan's "SUNRPC: Set alloc_slot for
backchannel tcp ops", without which the 4.1 server oopses.
parents f474af70 62d98c93

fs/nfs/nfs4namespace.c

+2 −2
Original line number Diff line number Diff line
@@ -198,14 +198,14 @@ struct rpc_clnt *nfs4_create_sec_client(struct rpc_clnt *clnt, struct inode *ino 


	flavor = nfs4_negotiate_security(inode, name);

	if ((int)flavor < 0)

		return ERR_PTR(flavor);

		return ERR_PTR((int)flavor);



	clone = rpc_clone_client(clnt);

	if (IS_ERR(clone))

		return clone;



	auth = rpcauth_create(flavor, clone);

	if (!auth) {

	if (IS_ERR(auth)) {

		rpc_shutdown_client(clone);

		clone = ERR_PTR(-EIO);

	}

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -2399,7 +2399,7 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl 
	int ret;



	auth = rpcauth_create(flavor, server->client);

	if (!auth) {

	if (IS_ERR(auth)) {

		ret = -EIO;

		goto out;

	}

net/sunrpc/xprtsock.c

+17 −5
Original line number Diff line number Diff line
@@ -1025,6 +1025,16 @@ static void xs_udp_data_ready(struct sock *sk, int len) 
	read_unlock_bh(&sk->sk_callback_lock);

}



/*

 * Helper function to force a TCP close if the server is sending

 * junk and/or it has put us in CLOSE_WAIT

 */

static void xs_tcp_force_close(struct rpc_xprt *xprt)

{

	set_bit(XPRT_CONNECTION_CLOSE, &xprt->state);

	xprt_force_disconnect(xprt);

}



static inline void xs_tcp_read_fraghdr(struct rpc_xprt *xprt, struct xdr_skb_reader *desc)

{

	struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
@@ -1051,7 +1061,7 @@ static inline void xs_tcp_read_fraghdr(struct rpc_xprt *xprt, struct xdr_skb_rea 
	/* Sanity check of the record length */

	if (unlikely(transport->tcp_reclen < 8)) {

		dprintk("RPC:       invalid TCP record fragment length\n");

		xprt_force_disconnect(xprt);

		xs_tcp_force_close(xprt);

		return;

	}

	dprintk("RPC:       reading TCP record fragment of length %d\n",
@@ -1132,7 +1142,7 @@ static inline void xs_tcp_read_calldir(struct sock_xprt *transport, 
		break;

	default:

		dprintk("RPC:       invalid request message type\n");

		xprt_force_disconnect(&transport->xprt);

		xs_tcp_force_close(&transport->xprt);

	}

	xs_tcp_check_fraghdr(transport);

}
@@ -1455,6 +1465,8 @@ static void xs_tcp_cancel_linger_timeout(struct rpc_xprt *xprt) 
static void xs_sock_mark_closed(struct rpc_xprt *xprt)

{

	smp_mb__before_clear_bit();

	clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);

	clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state);

	clear_bit(XPRT_CLOSE_WAIT, &xprt->state);

	clear_bit(XPRT_CLOSING, &xprt->state);

	smp_mb__after_clear_bit();
@@ -1512,8 +1524,8 @@ static void xs_tcp_state_change(struct sock *sk) 
		break;

	case TCP_CLOSE_WAIT:

		/* The server initiated a shutdown of the socket */

		xprt_force_disconnect(xprt);

		xprt->connect_cookie++;

		xs_tcp_force_close(xprt);

	case TCP_CLOSING:

		/*

		 * If the server closed down the connection, make sure that
@@ -2199,8 +2211,7 @@ static void xs_tcp_setup_socket(struct work_struct *work) 
		/* We're probably in TIME_WAIT. Get rid of existing socket,

		 * and retry

		 */

		set_bit(XPRT_CONNECTION_CLOSE, &xprt->state);

		xprt_force_disconnect(xprt);

		xs_tcp_force_close(xprt);

		break;

	case -ECONNREFUSED:

	case -ECONNRESET:
@@ -2528,6 +2539,7 @@ static struct rpc_xprt_ops xs_tcp_ops = { 
static struct rpc_xprt_ops bc_tcp_ops = {

	.reserve_xprt		= xprt_reserve_xprt,

	.release_xprt		= xprt_release_xprt,

	.alloc_slot		= xprt_alloc_slot,

	.rpcbind		= xs_local_rpcbind,

	.buf_alloc		= bc_malloc,

	.buf_free		= bc_free,