瀏覽代碼

knfsd: cleanup nfsd4 properly on module init failure

We forgot to shut down the nfs4 state and idmapping code in this case.

Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
J. Bruce Fields 17 年之前
父節點
當前提交
46b2589576
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      fs/nfsd/nfsctl.c

+ 2 - 0
fs/nfsd/nfsctl.c

@@ -695,12 +695,14 @@ static int __init init_nfsd(void)
 	}
 	}
 	retval = register_filesystem(&nfsd_fs_type);
 	retval = register_filesystem(&nfsd_fs_type);
 	if (retval) {
 	if (retval) {
+		nfsd_idmap_shutdown();
 		nfsd_export_shutdown();
 		nfsd_export_shutdown();
 		nfsd_cache_shutdown();
 		nfsd_cache_shutdown();
 		remove_proc_entry("fs/nfs/exports", NULL);
 		remove_proc_entry("fs/nfs/exports", NULL);
 		remove_proc_entry("fs/nfs", NULL);
 		remove_proc_entry("fs/nfs", NULL);
 		nfsd_stat_shutdown();
 		nfsd_stat_shutdown();
 		nfsd_lockd_shutdown();
 		nfsd_lockd_shutdown();
+		nfsd4_free_slabs();
 	}
 	}
 	return retval;
 	return retval;
 }
 }