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

NFSv4.1: Allow test_stateid to handle session errors without waiting

If the server crashes while we're testing stateids for validity, then
we want to initiate session recovery. Usually, we will be calling from
a state manager thread, though, so we don't really want to wait.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Tested-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

authored by

Trond Myklebust and committed by
Anna Schumaker
43912bbb 4c8e5447

+18 -3
+18 -3
fs/nfs/nfs4proc.c
··· 8797 8797 return -res.status; 8798 8798 } 8799 8799 8800 + static void nfs4_handle_delay_or_session_error(struct nfs_server *server, 8801 + int err, struct nfs4_exception *exception) 8802 + { 8803 + exception->retry = 0; 8804 + switch(err) { 8805 + case -NFS4ERR_DELAY: 8806 + nfs4_handle_exception(server, err, exception); 8807 + break; 8808 + case -NFS4ERR_BADSESSION: 8809 + case -NFS4ERR_BADSLOT: 8810 + case -NFS4ERR_BAD_HIGH_SLOT: 8811 + case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: 8812 + case -NFS4ERR_DEADSESSION: 8813 + nfs4_do_handle_exception(server, err, exception); 8814 + } 8815 + } 8816 + 8800 8817 /** 8801 8818 * nfs41_test_stateid - perform a TEST_STATEID operation 8802 8819 * ··· 8833 8816 int err; 8834 8817 do { 8835 8818 err = _nfs41_test_stateid(server, stateid, cred); 8836 - if (err != -NFS4ERR_DELAY) 8837 - break; 8838 - nfs4_handle_exception(server, err, &exception); 8819 + nfs4_handle_delay_or_session_error(server, err, &exception); 8839 8820 } while (exception.retry); 8840 8821 return err; 8841 8822 }