diff options
| author | Rick Macklem <rmacklem@FreeBSD.org> | 2021-11-03 00:28:13 +0000 |
|---|---|---|
| committer | Rick Macklem <rmacklem@FreeBSD.org> | 2021-11-03 00:28:13 +0000 |
| commit | 331883a2f2e9ae5567085e4cd3a7ae3db2a2b022 (patch) | |
| tree | defe847e0f872c0ddd3a254225705f00bb623d54 | |
| parent | edfbbfd541ab9f7ba13b246d86bd0c36757ec660 (diff) | |
| download | src-331883a2f2e9ae5567085e4cd3a7ae3db2a2b022.tar.gz src-331883a2f2e9ae5567085e4cd3a7ae3db2a2b022.zip | |
nfscl: Check for a forced dismount in nfscl_getref()
The nfscl_getref() function is called within nfscl_doiods() when
the NFSv4.1/4.2 pNFS client is doing I/O on a DS. As such,
nfscl_getref() needs to check for a forced dismount.
This patch adds that check.
Found during a recent IETF NFSv4 working group testing event.
MFC after: 2 weeks
| -rw-r--r-- | sys/fs/nfsclient/nfs_clstate.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 523cc59039af..22c0da1bcef8 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -4907,6 +4907,7 @@ int nfscl_getref(struct nfsmount *nmp) { struct nfsclclient *clp; + int ret; NFSLOCKCLSTATE(); clp = nfscl_findcl(nmp); @@ -4914,9 +4915,12 @@ nfscl_getref(struct nfsmount *nmp) NFSUNLOCKCLSTATE(); return (0); } - nfsv4_getref(&clp->nfsc_lock, NULL, NFSCLSTATEMUTEXPTR, NULL); + nfsv4_getref(&clp->nfsc_lock, NULL, NFSCLSTATEMUTEXPTR, nmp->nm_mountp); + ret = 1; + if (NFSCL_FORCEDISM(nmp->nm_mountp)) + ret = 0; NFSUNLOCKCLSTATE(); - return (1); + return (ret); } /* |