tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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"

Linus Torvalds 2db767d9 788c1da0

+9 -2
+2 -2
fs/nfs/nfs4state.c
··· 71 71 }; 72 72 const nfs4_stateid invalid_stateid = { 73 73 { 74 - .seqid = cpu_to_be32(0xffffffffU), 75 - .other = { 0 }, 74 + /* Funky initialiser keeps older gcc versions happy */ 75 + .data = { 0xff, 0xff, 0xff, 0xff, 0 }, 76 76 }, 77 77 .type = NFS4_INVALID_STATEID_TYPE, 78 78 };
+5
net/sunrpc/clnt.c
··· 1841 1841 case -ECONNABORTED: 1842 1842 case -ENOTCONN: 1843 1843 case -EHOSTDOWN: 1844 + case -ENETDOWN: 1844 1845 case -EHOSTUNREACH: 1845 1846 case -ENETUNREACH: 1846 1847 case -ENOBUFS: ··· 1918 1917 /* fall through */ 1919 1918 case -ECONNRESET: 1920 1919 case -ECONNABORTED: 1920 + case -ENETDOWN: 1921 1921 case -ENETUNREACH: 1922 1922 case -EHOSTUNREACH: 1923 1923 case -EADDRINUSE: ··· 2024 2022 */ 2025 2023 case -ECONNREFUSED: 2026 2024 case -EHOSTDOWN: 2025 + case -ENETDOWN: 2027 2026 case -EHOSTUNREACH: 2028 2027 case -ENETUNREACH: 2029 2028 case -EPERM: ··· 2074 2071 switch (task->tk_status) { 2075 2072 case 0: 2076 2073 /* Success */ 2074 + case -ENETDOWN: 2077 2075 case -EHOSTDOWN: 2078 2076 case -EHOSTUNREACH: 2079 2077 case -ENETUNREACH: ··· 2143 2139 task->tk_status = 0; 2144 2140 switch(status) { 2145 2141 case -EHOSTDOWN: 2142 + case -ENETDOWN: 2146 2143 case -EHOSTUNREACH: 2147 2144 case -ENETUNREACH: 2148 2145 case -EPERM:
+2
net/sunrpc/xprtsock.c
··· 2440 2440 */ 2441 2441 case -ECONNREFUSED: 2442 2442 case -ECONNRESET: 2443 + case -ENETDOWN: 2443 2444 case -ENETUNREACH: 2445 + case -EHOSTUNREACH: 2444 2446 case -EADDRINUSE: 2445 2447 case -ENOBUFS: 2446 2448 /*