Skip to content

Commit 9540730

Browse files
scottmayhewgregkh
authored andcommitted
nfsd: fix legacy client tracking initialization
commit de71d4e upstream. 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: 74fd487 ("nfsd: new Kconfig option for legacy client tracking") Reported-by: Jur van der Burg <[email protected]> Link: https://bugzilla.kernel.org/show_bug.cgi?id=219580 Signed-off-by: Scott Mayhew <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Tested-by: Salvatore Bonaccorso <[email protected]> Signed-off-by: Chuck Lever <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 09691f3 commit 9540730

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

fs/nfsd/nfs4recover.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2052,7 +2052,6 @@ static inline int check_for_legacy_methods(int status, struct net *net)
20522052
path_put(&path);
20532053
if (status)
20542054
return -ENOTDIR;
2055-
status = nn->client_tracking_ops->init(net);
20562055
}
20572056
return status;
20582057
}

0 commit comments

Comments
 (0)