History

NFSD: Remove NFSERR_EAGAIN

I haven't found an NFSERR_EAGAIN in RFCs 1094, 1813, 7530, or 8881. None of these RFCs have an NFS status code that match the numeric value "11". Based on the meaning of the EAGAIN errno, I presume the use of this status in NFSD means NFS4ERR_DELAY. So replace the one usage of nfserr_eagain, and remove it from NFSD's NFS status conversion tables. As far as I can tell, NFSERR_EAGAIN has existed since the pre-git era, but was not actually used by any code until commit f4e44b393389 ("NFSD: delay unmount source's export after inter-server copy completed."), at which time it become possible for NFSD to return a status code of 11 (which is not valid NFS protocol).

Chuck Lever committed 11 months ago

Commit c6c209c1 parent 1f941b25 files · +1 −6Browse files

Unified · Split

5 files
  1. fs/nfs_common/common.c +0 −1
  2. fs/nfsd/nfs4proc.c +1 −1
  3. fs/nfsd/nfsd.h +0 −1
  4. include/trace/misc/nfs.h +0 −2
  5. include/uapi/linux/nfs.h +0 −1
fs/nfs_common/common.c+0−1
@@ -17,7 +17,6 @@ static const struct { · 16 unmodified lines
17 { NFSERR_NOENT, -ENOENT },17 { NFSERR_NOENT, -ENOENT },
18 { NFSERR_IO, -EIO },18 { NFSERR_IO, -EIO },
19 { NFSERR_NXIO, -ENXIO },19 { NFSERR_NXIO, -ENXIO },
20/* { NFSERR_EAGAIN, -EAGAIN }, */
21 { NFSERR_ACCES, -EACCES },20 { NFSERR_ACCES, -EACCES },
22 { NFSERR_EXIST, -EEXIST },21 { NFSERR_EXIST, -EEXIST },
23 { NFSERR_XDEV, -EXDEV },22 { NFSERR_XDEV, -EXDEV },
fs/nfsd/nfs4proc.c+1−1
@@ -1506,7 +1506,7 @@ try_again: · 1505 unmodified lines
1506 (schedule_timeout(20*HZ) == 0)) {1506 (schedule_timeout(20*HZ) == 0)) {
1507 finish_wait(&nn->nfsd_ssc_waitq, &wait);1507 finish_wait(&nn->nfsd_ssc_waitq, &wait);
1508 kfree(work);1508 kfree(work);
1509 return nfserr_eagain;1509 return nfserr_jukebox;
1510 }1510 }
1511 finish_wait(&nn->nfsd_ssc_waitq, &wait);1511 finish_wait(&nn->nfsd_ssc_waitq, &wait);
1512 goto try_again;1512 goto try_again;
fs/nfsd/nfsd.h+0−1
@@ -233,7 +233,6 @@ void nfsd_lockd_shutdown(void); · 232 unmodified lines
233#define nfserr_noent cpu_to_be32(NFSERR_NOENT)233#define nfserr_noent cpu_to_be32(NFSERR_NOENT)
234#define nfserr_io cpu_to_be32(NFSERR_IO)234#define nfserr_io cpu_to_be32(NFSERR_IO)
235#define nfserr_nxio cpu_to_be32(NFSERR_NXIO)235#define nfserr_nxio cpu_to_be32(NFSERR_NXIO)
236#define nfserr_eagain cpu_to_be32(NFSERR_EAGAIN)
237#define nfserr_acces cpu_to_be32(NFSERR_ACCES)236#define nfserr_acces cpu_to_be32(NFSERR_ACCES)
238#define nfserr_exist cpu_to_be32(NFSERR_EXIST)237#define nfserr_exist cpu_to_be32(NFSERR_EXIST)
239#define nfserr_xdev cpu_to_be32(NFSERR_XDEV)238#define nfserr_xdev cpu_to_be32(NFSERR_XDEV)
include/trace/misc/nfs.h+0−2
@@ -16,7 +16,6 @@ TRACE_DEFINE_ENUM(NFSERR_PERM); · 15 unmodified lines
16TRACE_DEFINE_ENUM(NFSERR_NOENT);16TRACE_DEFINE_ENUM(NFSERR_NOENT);
17TRACE_DEFINE_ENUM(NFSERR_IO);17TRACE_DEFINE_ENUM(NFSERR_IO);
18TRACE_DEFINE_ENUM(NFSERR_NXIO);18TRACE_DEFINE_ENUM(NFSERR_NXIO);
19TRACE_DEFINE_ENUM(NFSERR_EAGAIN);
20TRACE_DEFINE_ENUM(NFSERR_ACCES);19TRACE_DEFINE_ENUM(NFSERR_ACCES);
21TRACE_DEFINE_ENUM(NFSERR_EXIST);20TRACE_DEFINE_ENUM(NFSERR_EXIST);
22TRACE_DEFINE_ENUM(NFSERR_XDEV);21TRACE_DEFINE_ENUM(NFSERR_XDEV);
@@ -52,7 +51,6 @@ TRACE_DEFINE_ENUM(NFSERR_JUKEBOX); · 29 unmodified lines
52 { NFSERR_NXIO, "NXIO" }, \51 { NFSERR_NXIO, "NXIO" }, \
53 { ECHILD, "CHILD" }, \52 { ECHILD, "CHILD" }, \
54 { ETIMEDOUT, "TIMEDOUT" }, \53 { ETIMEDOUT, "TIMEDOUT" }, \
55 { NFSERR_EAGAIN, "AGAIN" }, \
56 { NFSERR_ACCES, "ACCES" }, \54 { NFSERR_ACCES, "ACCES" }, \
57 { NFSERR_EXIST, "EXIST" }, \55 { NFSERR_EXIST, "EXIST" }, \
58 { NFSERR_XDEV, "XDEV" }, \56 { NFSERR_XDEV, "XDEV" }, \
include/uapi/linux/nfs.h+0−1
@@ -49,7 +49,6 @@ · 48 unmodified lines
49 NFSERR_NOENT = 2, /* v2 v3 v4 */49 NFSERR_NOENT = 2, /* v2 v3 v4 */
50 NFSERR_IO = 5, /* v2 v3 v4 */50 NFSERR_IO = 5, /* v2 v3 v4 */
51 NFSERR_NXIO = 6, /* v2 v3 v4 */51 NFSERR_NXIO = 6, /* v2 v3 v4 */
52 NFSERR_EAGAIN = 11, /* v2 v3 */
53 NFSERR_ACCES = 13, /* v2 v3 v4 */52 NFSERR_ACCES = 13, /* v2 v3 v4 */
54 NFSERR_EXIST = 17, /* v2 v3 v4 */53 NFSERR_EXIST = 17, /* v2 v3 v4 */
55 NFSERR_XDEV = 18, /* v3 v4 */54 NFSERR_XDEV = 18, /* v3 v4 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t