[PATCH 5.15, 5.10, 5.4] NFSv4: Don't clear capabilities that won't be reset

[Siddh Raman Pant]

From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

Don't clear the capabilities that are not going to get reset by the call
to _nfs4_server_capabilities().

Reported-by: Scott Haiden <scott.b.haiden@xxxxxxxxx>
Fixes: b01f21cacde9 ("NFS: Fix the setting of capabilities when automounting a new filesystem")
Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
(cherry picked from commit 31f1a960ad1a14def94fa0b8c25d62b4c032813f)
Signed-off-by: Siddh Raman Pant <siddh.raman.pant@xxxxxxxxxx>
---
This got backported till 6.1 but not later for some reason. It got
cherry-picked cleanly.

 fs/nfs/nfs4proc.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 5f8de86b2798..f511087d5e1c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3885,7 +3885,6 @@ int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
 	};
 	int err;
 
-	nfs_server_set_init_caps(server);
 	do {
 		err = nfs4_handle_exception(server,
 				_nfs4_server_capabilities(server, fhandle),
-- 
2.51.0