commit 47345b4264bc394a8d16bb16e8e7744965fa3934 Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Mon Jan 15 18:57:06 2024 +0100 Linux 6.6.12 Link: https://lore.kernel.org/r/20240113094204.275569789@linuxfoundation.org Tested-by: Salvatore Bonaccorso <carnil@debian.org> Tested-by: Takeshi Ogasawara <takeshi.ogasawara@futuring-girl.com> Tested-by: Luna Jernberg <droidbittin@gmail.com> Tested-by: SeongJae Park <sj@kernel.org> Tested-by: Bagas Sanjaya <bagasdotme@gmail.com> Tested-by: Ricardo B. Marliere <ricardo@marliere.net> Tested-by: Ron Economos <re@w6rz.net> Tested-by: Linux Kernel Functional Testing <lkft@linaro.org> Tested-by: Jon Hunter <jonathanh@nvidia.com> Tested-by: kernelci.org bot <bot@kernelci.org> Tested-by: Conor Dooley <conor.dooley@microchip.com> Tested-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> commit edbc5613957936dd6ca54a74e129ce9aa7442f82 Author: Jeff Layton <jlayton@kernel.org> Date: Wed Jan 3 08:36:52 2024 -0500 nfsd: drop the nfsd_put helper commit 64e6304169f1e1f078e7f0798033f80a7fb0ea46 upstream. It's not safe to call nfsd_put once nfsd_last_thread has been called, as that function will zero out the nn->nfsd_serv pointer. Drop the nfsd_put helper altogether and open-code the svc_put in its callers instead. That allows us to not be reliant on the value of that pointer when handling an error. Fixes: 2a501f55cd64 ("nfsd: call nfsd_last_thread() before final nfsd_put()") Reported-by: Zhi Li <yieli@redhat.com> Cc: NeilBrown <neilb@suse.de> Signed-off-by: Jeffrey Layton <jlayton@redhat.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>