+++ /dev/null
-From 73f6ed66fe4fc6f405e3d72225f9d5cc964c5265 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 22 May 2022 12:07:18 -0400
-Subject: NFSD: Modernize nfsd4_release_lockowner()
-
-From: Chuck Lever <chuck.lever@oracle.com>
-
-[ Upstream commit bd8fdb6e545f950f4654a9a10d7e819ad48146e5 ]
-
-Refactor: Use existing helpers that other lock operations use. This
-change removes several automatic variables, so re-organize the
-variable declarations for readability.
-
-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 | 36 +++++++++++-------------------------
- 1 file changed, 11 insertions(+), 25 deletions(-)
-
-diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
-index d402ca0b535f0..1b40b2197ce66 100644
---- a/fs/nfsd/nfs4state.c
-+++ b/fs/nfsd/nfs4state.c
-@@ -7113,16 +7113,13 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
- union nfsd4_op_u *u)
- {
- struct nfsd4_release_lockowner *rlockowner = &u->release_lockowner;
-+ struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
- clientid_t *clid = &rlockowner->rl_clientid;
-- struct nfs4_stateowner *sop;
-- struct nfs4_lockowner *lo = NULL;
- struct nfs4_ol_stateid *stp;
-- struct xdr_netobj *owner = &rlockowner->rl_owner;
-- unsigned int hashval = ownerstr_hashval(owner);
-- __be32 status;
-- struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
-+ struct nfs4_lockowner *lo;
- struct nfs4_client *clp;
-- LIST_HEAD (reaplist);
-+ LIST_HEAD(reaplist);
-+ __be32 status;
-
- dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",
- clid->cl_boot, clid->cl_id);
-@@ -7130,30 +7127,19 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
- status = lookup_clientid(clid, cstate, nn, false);
- if (status)
- return status;
--
- clp = cstate->clp;
-- /* Find the matching lock stateowner */
-- spin_lock(&clp->cl_lock);
-- list_for_each_entry(sop, &clp->cl_ownerstr_hashtbl[hashval],
-- so_strhash) {
-
-- if (sop->so_is_open_owner || !same_owner_str(sop, owner))
-- continue;
--
-- if (atomic_read(&sop->so_count) != 1) {
-- spin_unlock(&clp->cl_lock);
-- return nfserr_locks_held;
-- }
--
-- lo = lockowner(sop);
-- nfs4_get_stateowner(sop);
-- break;
-- }
-+ spin_lock(&clp->cl_lock);
-+ lo = find_lockowner_str_locked(clp, &rlockowner->rl_owner);
- if (!lo) {
- spin_unlock(&clp->cl_lock);
- return status;
- }
--
-+ if (atomic_read(&lo->lo_owner.so_count) != 2) {
-+ spin_unlock(&clp->cl_lock);
-+ nfs4_put_stateowner(&lo->lo_owner);
-+ return nfserr_locks_held;
-+ }
- unhash_lockowner_locked(lo);
- while (!list_empty(&lo->lo_owner.so_stateids)) {
- stp = list_first_entry(&lo->lo_owner.so_stateids,
---
-2.43.0
-
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
selftests-mm-switch-to-bash-from-sh.patch
selftests-mm-fix-map_hugetlb-failure-on-64k-page-siz.patch
um-allow-not-setting-extra-rpaths-in-the-linux-binar.patch
+++ /dev/null
-From 6b245dd6dcc09fc719185689ac9fcc0bb9cd7cf0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 22 May 2022 12:07:18 -0400
-Subject: NFSD: Modernize nfsd4_release_lockowner()
-
-From: Chuck Lever <chuck.lever@oracle.com>
-
-[ Upstream commit bd8fdb6e545f950f4654a9a10d7e819ad48146e5 ]
-
-Refactor: Use existing helpers that other lock operations use. This
-change removes several automatic variables, so re-organize the
-variable declarations for readability.
-
-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 | 36 +++++++++++-------------------------
- 1 file changed, 11 insertions(+), 25 deletions(-)
-
-diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
-index 9b660491f3931..798063b9b96fd 100644
---- a/fs/nfsd/nfs4state.c
-+++ b/fs/nfsd/nfs4state.c
-@@ -7290,16 +7290,13 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
- union nfsd4_op_u *u)
- {
- struct nfsd4_release_lockowner *rlockowner = &u->release_lockowner;
-+ struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
- clientid_t *clid = &rlockowner->rl_clientid;
-- struct nfs4_stateowner *sop;
-- struct nfs4_lockowner *lo = NULL;
- struct nfs4_ol_stateid *stp;
-- struct xdr_netobj *owner = &rlockowner->rl_owner;
-- unsigned int hashval = ownerstr_hashval(owner);
-- __be32 status;
-- struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
-+ struct nfs4_lockowner *lo;
- struct nfs4_client *clp;
-- LIST_HEAD (reaplist);
-+ LIST_HEAD(reaplist);
-+ __be32 status;
-
- dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",
- clid->cl_boot, clid->cl_id);
-@@ -7307,30 +7304,19 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
- status = set_client(clid, cstate, nn);
- if (status)
- return status;
--
- clp = cstate->clp;
-- /* Find the matching lock stateowner */
-- spin_lock(&clp->cl_lock);
-- list_for_each_entry(sop, &clp->cl_ownerstr_hashtbl[hashval],
-- so_strhash) {
-
-- if (sop->so_is_open_owner || !same_owner_str(sop, owner))
-- continue;
--
-- if (atomic_read(&sop->so_count) != 1) {
-- spin_unlock(&clp->cl_lock);
-- return nfserr_locks_held;
-- }
--
-- lo = lockowner(sop);
-- nfs4_get_stateowner(sop);
-- break;
-- }
-+ spin_lock(&clp->cl_lock);
-+ lo = find_lockowner_str_locked(clp, &rlockowner->rl_owner);
- if (!lo) {
- spin_unlock(&clp->cl_lock);
- return status;
- }
--
-+ if (atomic_read(&lo->lo_owner.so_count) != 2) {
-+ spin_unlock(&clp->cl_lock);
-+ nfs4_put_stateowner(&lo->lo_owner);
-+ return nfserr_locks_held;
-+ }
- unhash_lockowner_locked(lo);
- while (!list_empty(&lo->lo_owner.so_stateids)) {
- stp = list_first_entry(&lo->lo_owner.so_stateids,
---
-2.43.0
-
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
alsa-usb-audio-refcount-multiple-accesses-on-the-sin.patch
alsa-usb-audio-clear-fixed-clock-rate-at-closing-ep.patch
alsa-usb-audio-split-endpoint-setups-for-hw_params-a.patch
+++ /dev/null
-From 17087f9cfb05d32235f210d1c257dfaeb8730f95 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 22 May 2022 12:07:18 -0400
-Subject: NFSD: Modernize nfsd4_release_lockowner()
-
-From: Chuck Lever <chuck.lever@oracle.com>
-
-[ Upstream commit bd8fdb6e545f950f4654a9a10d7e819ad48146e5 ]
-
-Refactor: Use existing helpers that other lock operations use. This
-change removes several automatic variables, so re-organize the
-variable declarations for readability.
-
-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 | 36 +++++++++++-------------------------
- 1 file changed, 11 insertions(+), 25 deletions(-)
-
-diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
-index a0aa7e63739df..9a77a3eac4acc 100644
---- a/fs/nfsd/nfs4state.c
-+++ b/fs/nfsd/nfs4state.c
-@@ -6873,16 +6873,13 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
- union nfsd4_op_u *u)
- {
- struct nfsd4_release_lockowner *rlockowner = &u->release_lockowner;
-+ struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
- clientid_t *clid = &rlockowner->rl_clientid;
-- struct nfs4_stateowner *sop;
-- struct nfs4_lockowner *lo = NULL;
- struct nfs4_ol_stateid *stp;
-- struct xdr_netobj *owner = &rlockowner->rl_owner;
-- unsigned int hashval = ownerstr_hashval(owner);
-- __be32 status;
-- struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
-+ struct nfs4_lockowner *lo;
- struct nfs4_client *clp;
-- LIST_HEAD (reaplist);
-+ LIST_HEAD(reaplist);
-+ __be32 status;
-
- dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",
- clid->cl_boot, clid->cl_id);
-@@ -6890,30 +6887,19 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
- status = lookup_clientid(clid, cstate, nn);
- if (status)
- return status;
--
- clp = cstate->clp;
-- /* Find the matching lock stateowner */
-- spin_lock(&clp->cl_lock);
-- list_for_each_entry(sop, &clp->cl_ownerstr_hashtbl[hashval],
-- so_strhash) {
-
-- if (sop->so_is_open_owner || !same_owner_str(sop, owner))
-- continue;
--
-- if (atomic_read(&sop->so_count) != 1) {
-- spin_unlock(&clp->cl_lock);
-- return nfserr_locks_held;
-- }
--
-- lo = lockowner(sop);
-- nfs4_get_stateowner(sop);
-- break;
-- }
-+ spin_lock(&clp->cl_lock);
-+ lo = find_lockowner_str_locked(clp, &rlockowner->rl_owner);
- if (!lo) {
- spin_unlock(&clp->cl_lock);
- return status;
- }
--
-+ if (atomic_read(&lo->lo_owner.so_count) != 2) {
-+ spin_unlock(&clp->cl_lock);
-+ nfs4_put_stateowner(&lo->lo_owner);
-+ return nfserr_locks_held;
-+ }
- unhash_lockowner_locked(lo);
- while (!list_empty(&lo->lo_owner.so_stateids)) {
- stp = list_first_entry(&lo->lo_owner.so_stateids,
---
-2.43.0
-
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
selftests-mm-fix-map_hugetlb-failure-on-64k-page-siz.patch
um-allow-not-setting-extra-rpaths-in-the-linux-binar.patch
um-fix-adding-no-pie-for-clang.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
