Commit 2db767d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.15-2' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client fixes from Anna Schumaker:
 "These patches fix a problem with compiling using an old version of
  gcc, and also fix up error handling in the SUNRPC layer.

   - NFSv4: Ensure gcc 4.4.4 can compile initialiser for
     "invalid_stateid"

   - SUNRPC: Allow connect to return EHOSTUNREACH

   - SUNRPC: Handle ENETDOWN errors"

* tag 'nfs-for-4.15-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  SUNRPC: Handle ENETDOWN errors
  SUNRPC: Allow connect to return EHOSTUNREACH
  NFSv4: Ensure gcc 4.4.4 can compile initialiser for "invalid_stateid"
parents 788c1da0 eb5b46fa

fs/nfs/nfs4state.c

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ const nfs4_stateid zero_stateid = { 
};

const nfs4_stateid invalid_stateid = {

	{

		.seqid = cpu_to_be32(0xffffffffU),

		.other = { 0 },

		/* Funky initialiser keeps older gcc versions happy */

		.data = { 0xff, 0xff, 0xff, 0xff, 0 },

	},

	.type = NFS4_INVALID_STATEID_TYPE,

};

net/sunrpc/clnt.c

+5 −0
Original line number Diff line number Diff line
@@ -1841,6 +1841,7 @@ call_bind_status(struct rpc_task *task) 
	case -ECONNABORTED:

	case -ENOTCONN:

	case -EHOSTDOWN:

	case -ENETDOWN:

	case -EHOSTUNREACH:

	case -ENETUNREACH:

	case -ENOBUFS:
@@ -1917,6 +1918,7 @@ call_connect_status(struct rpc_task *task) 
		/* fall through */

	case -ECONNRESET:

	case -ECONNABORTED:

	case -ENETDOWN:

	case -ENETUNREACH:

	case -EHOSTUNREACH:

	case -EADDRINUSE:
@@ -2022,6 +2024,7 @@ call_transmit_status(struct rpc_task *task) 
		 */

	case -ECONNREFUSED:

	case -EHOSTDOWN:

	case -ENETDOWN:

	case -EHOSTUNREACH:

	case -ENETUNREACH:

	case -EPERM:
@@ -2071,6 +2074,7 @@ call_bc_transmit(struct rpc_task *task) 
	switch (task->tk_status) {

	case 0:

		/* Success */

	case -ENETDOWN:

	case -EHOSTDOWN:

	case -EHOSTUNREACH:

	case -ENETUNREACH:
@@ -2139,6 +2143,7 @@ call_status(struct rpc_task *task) 
	task->tk_status = 0;

	switch(status) {

	case -EHOSTDOWN:

	case -ENETDOWN:

	case -EHOSTUNREACH:

	case -ENETUNREACH:

	case -EPERM:

net/sunrpc/xprtsock.c

+2 −0
Original line number Diff line number Diff line
@@ -2440,7 +2440,9 @@ static void xs_tcp_setup_socket(struct work_struct *work) 
		 */

	case -ECONNREFUSED:

	case -ECONNRESET:

	case -ENETDOWN:

	case -ENETUNREACH:

	case -EHOSTUNREACH:

	case -EADDRINUSE:

	case -ENOBUFS:

		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE