patch-2.2.0-pre4 linux/fs/nfsd/nfsctl.c

Next file: linux/fs/nfsd/stats.c
Previous file: linux/fs/nfs/write.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre3/linux/fs/nfsd/nfsctl.c linux/fs/nfsd/nfsctl.c
@@ -54,8 +54,6 @@
 
 static int	initialized = 0;
 
-#ifdef CONFIG_PROC_FS
-
 int exp_procfs_exports(char *buffer, char **start, off_t offset,
                              int length, int *eof, void *data);
 
@@ -70,7 +68,6 @@
 	nfs_export_ent->read_proc = exp_procfs_exports;
 }
 
-#endif
 
 /*
  * Initialize nfsd
@@ -79,16 +76,12 @@
 nfsd_init(void)
 {
 	nfsd_xdr_init();	/* XDR */
-#ifdef CONFIG_PROC_FS
 	nfsd_stat_init();	/* Statistics */
-#endif
 	nfsd_cache_init();	/* RPC reply cache */
 	nfsd_export_init();	/* Exports table */
 	nfsd_lockd_init();	/* lockd->nfsd callbacks */
 	nfsd_fh_init();		/* FH table */
-#ifdef CONFIG_PROC_FS
 	proc_export_init();
-#endif
 	initialized = 1;
 }
 
@@ -310,11 +303,9 @@
 	nfsd_export_shutdown();
 	nfsd_cache_shutdown();
 	nfsd_fh_free();
-#ifdef CONFIG_PROC_FS
 	remove_proc_entry("fs/nfs/exports", NULL);
 	remove_proc_entry("fs/nfs", NULL);
 	nfsd_stat_shutdown();
-#endif
 	nfsd_lockd_shutdown();
 }
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov