git: a715704e53bd - stable/12 - nfscl: Restructure nfscl_freeopen() slightly
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 19 Nov 2021 02:48:54 UTC
The branch stable/12 has been updated by rmacklem:
URL: https://cgit.FreeBSD.org/src/commit/?id=a715704e53bd84215469f21cd03d5ece9c6c220e
commit a715704e53bd84215469f21cd03d5ece9c6c220e
Author: Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2021-10-15 00:28:01 +0000
Commit: Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2021-11-19 02:45:13 +0000
nfscl: Restructure nfscl_freeopen() slightly
This patch factors the unlinking of the nfsclopen structure out of
nfscl_freeopen() into a separate function called nfscl_unlinkopen().
It also adds a new argument to nfscl_freeopen() to conditionally do
the unlink. Since this new argument is always passed in as "true"
at this time, no semantics change should occur.
This is being done to prepare the code for a future patch that fixes
the case where an NFSv4.1/4.2 server replies NFSERR_DELAY to a Close
operation.
(cherry picked from commit 6495766acfb242048a80d58956b2cebbd885d8cc)
---
sys/fs/nfs/nfs_var.h | 2 +-
sys/fs/nfsclient/nfs_clrpcops.c | 2 +-
sys/fs/nfsclient/nfs_clstate.c | 38 +++++++++++++++++++++++++-------------
3 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h
index e93d6e9bdf27..536f3634dcff 100644
--- a/sys/fs/nfs/nfs_var.h
+++ b/sys/fs/nfs/nfs_var.h
@@ -562,7 +562,7 @@ int nfscl_checkwritelocked(vnode_t, struct flock *,
void nfscl_lockrelease(struct nfscllockowner *, int, int);
void nfscl_fillclid(u_int64_t, char *, u_int8_t *, u_int16_t);
void nfscl_filllockowner(void *, u_int8_t *, int);
-void nfscl_freeopen(struct nfsclopen *, int);
+void nfscl_freeopen(struct nfsclopen *, int, bool);
void nfscl_umount(struct nfsmount *, NFSPROC_T *, struct nfscldeleghead *);
void nfscl_renewthread(struct nfsclclient *, NFSPROC_T *);
void nfscl_initiate_recovery(struct nfsclclient *);
diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c
index 992b8ad8bdcd..5da95f850856 100644
--- a/sys/fs/nfsclient/nfs_clrpcops.c
+++ b/sys/fs/nfsclient/nfs_clrpcops.c
@@ -816,7 +816,7 @@ nfsrpc_doclose(struct nfsmount *nmp, struct nfsclopen *op, NFSPROC_T *p)
LIST_FOREACH_SAFE(lp, &op->nfso_lock, nfsl_list, nlp)
nfscl_freelockowner(lp, 0);
- nfscl_freeopen(op, 0);
+ nfscl_freeopen(op, 0, true);
NFSUNLOCKCLSTATE();
NFSFREECRED(tcred);
}
diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c
index 9eeb2ca10865..ad8770950f56 100644
--- a/sys/fs/nfsclient/nfs_clstate.c
+++ b/sys/fs/nfsclient/nfs_clstate.c
@@ -103,6 +103,7 @@ static int nfscl_layoutcnt = 0;
static int nfscl_getopen(struct nfsclownerhead *, u_int8_t *, int, u_int8_t *,
u_int8_t *, u_int32_t, struct nfscllockowner **, struct nfsclopen **);
static void nfscl_clrelease(struct nfsclclient *);
+static void nfscl_unlinkopen(struct nfsclopen *);
static void nfscl_cleanclient(struct nfsclclient *);
static void nfscl_expireclient(struct nfsclclient *, struct nfsmount *,
struct ucred *, NFSPROC_T *);
@@ -760,7 +761,7 @@ nfscl_openrelease(struct nfsmount *nmp, struct nfsclopen *op, int error,
nfscl_lockunlock(&owp->nfsow_rwlock);
clp = owp->nfsow_clp;
if (error && candelete && op->nfso_opencnt == 0)
- nfscl_freeopen(op, 0);
+ nfscl_freeopen(op, 0, true);
nfscl_clrelease(clp);
NFSUNLOCKCLSTATE();
}
@@ -1459,14 +1460,25 @@ nfscl_lockrelease(struct nfscllockowner *lp, int error, int candelete)
NFSUNLOCKCLSTATE();
}
+/*
+ * Unlink the open structure.
+ */
+static void
+nfscl_unlinkopen(struct nfsclopen *op)
+{
+
+ LIST_REMOVE(op, nfso_list);
+}
+
/*
* Free up an open structure and any associated byte range lock structures.
*/
void
-nfscl_freeopen(struct nfsclopen *op, int local)
+nfscl_freeopen(struct nfsclopen *op, int local, bool unlink)
{
- LIST_REMOVE(op, nfso_list);
+ if (unlink)
+ nfscl_unlinkopen(op);
nfscl_freealllocks(&op->nfso_lock, local);
free(op, M_NFSCLOPEN);
if (local)
@@ -1537,7 +1549,7 @@ nfscl_expireopen(struct nfsclclient *clp, struct nfsclopen *op,
* If a byte range lock or Share deny or couldn't re-open, free it.
*/
if (mustdelete)
- nfscl_freeopen(op, 0);
+ nfscl_freeopen(op, 0, true);
return (mustdelete);
}
@@ -1604,7 +1616,7 @@ nfscl_cleandeleg(struct nfscldeleg *dp)
if (op != NULL) {
if (LIST_NEXT(op, nfso_list) != NULL)
panic("nfscleandel");
- nfscl_freeopen(op, 1);
+ nfscl_freeopen(op, 1, true);
}
nfscl_freeopenowner(owp, 1);
}
@@ -1646,7 +1658,7 @@ nfscl_cleanclient(struct nfsclclient *clp)
/* Now, all the OpenOwners, etc. */
LIST_FOREACH_SAFE(owp, &clp->nfsc_owner, nfsow_list, nowp) {
LIST_FOREACH_SAFE(op, &owp->nfsow_open, nfso_list, nop) {
- nfscl_freeopen(op, 0);
+ nfscl_freeopen(op, 0, true);
}
nfscl_freeopenowner(owp, 0);
}
@@ -2166,7 +2178,7 @@ nfscl_recover(struct nfsclclient *clp, struct ucred *cred, NFSPROC_T *p)
}
}
if (error != 0 && error != NFSERR_BADSESSION)
- nfscl_freeopen(op, 0);
+ nfscl_freeopen(op, 0, true);
op = nop;
}
owp = nowp;
@@ -3246,7 +3258,7 @@ nfscl_doclose(vnode_t vp, struct nfsclclient **clpp, NFSPROC_T *p)
if (op != NULL) {
KASSERT((op->nfso_opencnt == 0),
("nfscl: bad open cnt on deleg"));
- nfscl_freeopen(op, 1);
+ nfscl_freeopen(op, 1, true);
}
nfscl_freeopenowner(owp, 1);
}
@@ -4105,7 +4117,7 @@ nfscl_recalldeleg(struct nfsclclient *clp, struct nfsmount *nmp,
ret == NFSERR_BADSESSION)
return (ret);
if (ret) {
- nfscl_freeopen(lop, 1);
+ nfscl_freeopen(lop, 1, true);
if (!error)
error = ret;
}
@@ -4134,7 +4146,7 @@ nfscl_recalldeleg(struct nfsclclient *clp, struct nfsmount *nmp,
ret == NFSERR_BADSESSION)
return (ret);
if (ret) {
- nfscl_freeopen(lop, 1);
+ nfscl_freeopen(lop, 1, true);
if (!error)
error = ret;
}
@@ -4186,7 +4198,7 @@ nfscl_moveopen(vnode_t vp, struct nfsclclient *clp, struct nfsmount *nmp,
op->nfso_fhlen == lop->nfso_fhlen &&
!NFSBCMP(op->nfso_fh, lop->nfso_fh, op->nfso_fhlen)) {
op->nfso_opencnt += lop->nfso_opencnt;
- nfscl_freeopen(lop, 1);
+ nfscl_freeopen(lop, 1, true);
return (0);
}
}
@@ -4204,11 +4216,11 @@ nfscl_moveopen(vnode_t vp, struct nfsclclient *clp, struct nfsmount *nmp,
NFS4NODENAME(np->n_v4), np->n_v4->n4_namelen, &ndp, 0, 0, cred, p);
if (error) {
if (newone)
- nfscl_freeopen(op, 0);
+ nfscl_freeopen(op, 0, true);
} else {
op->nfso_mode |= lop->nfso_mode;
op->nfso_opencnt += lop->nfso_opencnt;
- nfscl_freeopen(lop, 1);
+ nfscl_freeopen(lop, 1, true);
}
if (nop != NULL)
free(nop, M_NFSCLOPEN);