34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
From: Scott Mayhew <smayhew@redhat.com>
|
||
|
|
Date: Tue, 10 Dec 2024 07:25:54 -0500
|
||
|
|
Subject: nfsd: fix legacy client tracking initialization
|
||
|
|
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git/commit/?h=nfsd-next&id=45cd8c0c13fe5c9f1b926bd307df431f8f1b8a16
|
||
|
|
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=219580
|
||
|
|
Bug-Debian: https://bugs.debian.org/1087900
|
||
|
|
|
||
|
|
Get rid of the nfsd4_legacy_tracking_ops->init() call in
|
||
|
|
check_for_legacy_methods(). That will be handled in the caller
|
||
|
|
(nfsd4_client_tracking_init()). Otherwise, we'll wind up calling
|
||
|
|
nfsd4_legacy_tracking_ops->init() twice, and the second time we'll
|
||
|
|
trigger the BUG_ON() in nfsd4_init_recdir().
|
||
|
|
|
||
|
|
Fixes: 74fd48739d04 ("nfsd: new Kconfig option for legacy client tracking")
|
||
|
|
Reported-by: Jur van der Burg <jur@avtware.com>
|
||
|
|
Link: https://bugzilla.kernel.org/show_bug.cgi?id=219580
|
||
|
|
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
|
||
|
|
Reviewed-by: Jeff Layton <jlayton@kernel.org>
|
||
|
|
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
|
||
|
|
---
|
||
|
|
fs/nfsd/nfs4recover.c | 1 -
|
||
|
|
1 file changed, 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/fs/nfsd/nfs4recover.c
|
||
|
|
+++ b/fs/nfsd/nfs4recover.c
|
||
|
|
@@ -2052,7 +2052,6 @@ static inline int check_for_legacy_metho
|
||
|
|
path_put(&path);
|
||
|
|
if (status)
|
||
|
|
return -ENOTDIR;
|
||
|
|
- status = nn->client_tracking_ops->init(net);
|
||
|
|
}
|
||
|
|
return status;
|
||
|
|
}
|