diff options
| author | Sasha Levin <sashal@kernel.org> | 2024-03-10 09:21:30 -0400 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-10 09:21:30 -0400 |
| commit | c03fa5750de6de6f4ed3f55fc3ee77b80d882821 (patch) | |
| tree | 4603f845a644ad838fe1b246876c8e04791d2052 /queue-5.10 | |
| parent | e61281ad02e59240b9da6b9c32135ac501b8f64a (diff) | |
| download | stable-queue-c03fa5750de6de6f4ed3f55fc3ee77b80d882821.tar.gz | |
Drop nfsd-add-documenting-comment-for-nfsd4_release_locko.patch
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'queue-5.10')
| -rw-r--r-- | queue-5.10/nfsd-add-documenting-comment-for-nfsd4_release_locko.patch | 73 | ||||
| -rw-r--r-- | queue-5.10/series | 1 |
2 files changed, 0 insertions, 74 deletions
diff --git a/queue-5.10/nfsd-add-documenting-comment-for-nfsd4_release_locko.patch b/queue-5.10/nfsd-add-documenting-comment-for-nfsd4_release_locko.patch deleted file mode 100644 index 704cb378f9..0000000000 --- a/queue-5.10/nfsd-add-documenting-comment-for-nfsd4_release_locko.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 37e6ea8769930834d3f74552c946172c8ef147e0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin <sashal@kernel.org> -Date: Sun, 22 May 2022 12:34:38 -0400 -Subject: NFSD: Add documenting comment for nfsd4_release_lockowner() - -From: Chuck Lever <chuck.lever@oracle.com> - -[ Upstream commit 043862b09cc00273e35e6c3a6389957953a34207 ] - -And return explicit nfserr values that match what is documented in the -new comment / API contract. - -Signed-off-by: Chuck Lever <chuck.lever@oracle.com> -Stable-dep-of: edcf9725150e ("nfsd: fix RELEASE_LOCKOWNER") -Signed-off-by: Sasha Levin <sashal@kernel.org> ---- - fs/nfsd/nfs4state.c | 23 ++++++++++++++++++++--- - 1 file changed, 20 insertions(+), 3 deletions(-) - -diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c -index 1b40b2197ce66..b6480be7b5e6a 100644 ---- a/fs/nfsd/nfs4state.c -+++ b/fs/nfsd/nfs4state.c -@@ -7107,6 +7107,23 @@ check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner) - return status; - } - -+/** -+ * nfsd4_release_lockowner - process NFSv4.0 RELEASE_LOCKOWNER operations -+ * @rqstp: RPC transaction -+ * @cstate: NFSv4 COMPOUND state -+ * @u: RELEASE_LOCKOWNER arguments -+ * -+ * The lockowner's so_count is bumped when a lock record is added -+ * or when copying a conflicting lock. The latter case is brief, -+ * but can lead to fleeting false positives when looking for -+ * locks-in-use. -+ * -+ * Return values: -+ * %nfs_ok: lockowner released or not found -+ * %nfserr_locks_held: lockowner still in use -+ * %nfserr_stale_clientid: clientid no longer active -+ * %nfserr_expired: clientid not recognized -+ */ - __be32 - nfsd4_release_lockowner(struct svc_rqst *rqstp, - struct nfsd4_compound_state *cstate, -@@ -7133,7 +7150,7 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, - lo = find_lockowner_str_locked(clp, &rlockowner->rl_owner); - if (!lo) { - spin_unlock(&clp->cl_lock); -- return status; -+ return nfs_ok; - } - if (atomic_read(&lo->lo_owner.so_count) != 2) { - spin_unlock(&clp->cl_lock); -@@ -7149,11 +7166,11 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, - put_ol_stateid_locked(stp, &reaplist); - } - spin_unlock(&clp->cl_lock); -+ - free_ol_stateid_reaplist(&reaplist); - remove_blocked_locks(lo); - nfs4_put_stateowner(&lo->lo_owner); -- -- return status; -+ return nfs_ok; - } - - static inline struct nfs4_client_reclaim * --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index c714261472..3711cb3f28 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -29,7 +29,6 @@ netrom-fix-a-data-race-around-sysctl_netrom_routing_.patch netrom-fix-a-data-race-around-sysctl_netrom_link_fai.patch netrom-fix-data-races-around-sysctl_net_busy_read.patch nfsd-modernize-nfsd4_release_lockowner.patch -nfsd-add-documenting-comment-for-nfsd4_release_locko.patch nfsd-fix-release_lockowner.patch selftests-mm-switch-to-bash-from-sh.patch selftests-mm-fix-map_hugetlb-failure-on-64k-page-siz.patch |