diff options
| author | David Howells <dhowells@redhat.com> | 2018-11-14 00:20:28 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-11-30 03:08:14 +0100 |
| commit | 4584ae96ae307613625e80cb9c7d9a981bed47a7 (patch) | |
| tree | 3afe04fe4a054f74c7cfe1502cbfcee583b0d9ad /fs/afs/internal.h | |
| parent | afs: Fix validation/callback interaction (diff) | |
| download | linux-4584ae96ae307613625e80cb9c7d9a981bed47a7.tar.xz linux-4584ae96ae307613625e80cb9c7d9a981bed47a7.zip | |
afs: Fix missing net error handling
kAFS can be given certain network errors (EADDRNOTAVAIL, EHOSTDOWN and
ERFKILL) that it doesn't handle in its server/address rotation algorithms.
They cause the probing and rotation to abort immediately rather than
rotating.
Fix this by:
(1) Abstracting out the error prioritisation from the VL and FS rotation
algorithms into a common function and expand usage into the server
probing code.
When multiple errors are available, this code selects the one we'd
prefer to return.
(2) Add handling for EADDRNOTAVAIL, EHOSTDOWN and ERFKILL.
Fixes: 0fafdc9f888b ("afs: Fix file locking")
Fixes: 0338747d8454 ("afs: Probe multiple fileservers simultaneously")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/afs/internal.h')
| -rw-r--r-- | fs/afs/internal.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 5da3b09b7518..8871b9e8645f 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -696,6 +696,14 @@ struct afs_interface { }; /* + * Error prioritisation and accumulation. + */ +struct afs_error { + short error; /* Accumulated error */ + bool responded; /* T if server responded */ +}; + +/* * Cursor for iterating over a server's address list. */ struct afs_addr_cursor { @@ -1015,6 +1023,7 @@ static inline void __afs_stat(atomic_t *s) * misc.c */ extern int afs_abort_to_error(u32); +extern void afs_prioritise_error(struct afs_error *, int, u32); /* * mntpt.c |