adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

proc: remove proc_root_fs

Browse source 
Use creation by full path instead: "fs/foo".

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan 2008-04-29 01:01:42 -07:00 committed by Linus Torvalds
parent 9c37066d88
commit 36a5aeb878
6 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/cifs/cifs_debug.c
View file

@ -468,7 +468,7 @@ cifs_proc_init(void)
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;
proc_fs_cifs = proc_mkdir("cifs", proc_root_fs); proc_fs_cifs = proc_mkdir("fs/cifs", NULL);
if (proc_fs_cifs == NULL) if (proc_fs_cifs == NULL)
return; return;
@ -559,7 +559,7 @@ cifs_proc_clean(void)
remove_proc_entry("LinuxExtensionsEnabled", proc_fs_cifs); remove_proc_entry("LinuxExtensionsEnabled", proc_fs_cifs);
remove_proc_entry("Experimental", proc_fs_cifs); remove_proc_entry("Experimental", proc_fs_cifs);
remove_proc_entry("LookupCacheEnabled", proc_fs_cifs); remove_proc_entry("LookupCacheEnabled", proc_fs_cifs);
remove_proc_entry("cifs", proc_root_fs); remove_proc_entry("fs/cifs", NULL);
} }
static int static int

7
fs/ext4/mballoc.c
View file

@ -2867,7 +2867,6 @@ static void ext4_mb_free_committed_blocks(struct super_block *sb)
mb_debug("freed %u blocks in %u structures\n", count, count2); mb_debug("freed %u blocks in %u structures\n", count, count2);
} }
#define EXT4_ROOT "ext4"
#define EXT4_MB_STATS_NAME "stats" #define EXT4_MB_STATS_NAME "stats"
#define EXT4_MB_MAX_TO_SCAN_NAME "max_to_scan" #define EXT4_MB_MAX_TO_SCAN_NAME "max_to_scan"
#define EXT4_MB_MIN_TO_SCAN_NAME "min_to_scan" #define EXT4_MB_MIN_TO_SCAN_NAME "min_to_scan"
@ -3007,9 +3006,9 @@ int __init init_ext4_mballoc(void)
return -ENOMEM; return -ENOMEM;
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
proc_root_ext4 = proc_mkdir(EXT4_ROOT, proc_root_fs); proc_root_ext4 = proc_mkdir("fs/ext4", NULL);
if (proc_root_ext4 == NULL) if (proc_root_ext4 == NULL)
printk(KERN_ERR "EXT4-fs: Unable to create %s\n", EXT4_ROOT); printk(KERN_ERR "EXT4-fs: Unable to create fs/ext4\n");
#endif #endif
return 0; return 0;
} }
@ -3020,7 +3019,7 @@ void exit_ext4_mballoc(void)
kmem_cache_destroy(ext4_pspace_cachep); kmem_cache_destroy(ext4_pspace_cachep);
kmem_cache_destroy(ext4_ac_cachep); kmem_cache_destroy(ext4_ac_cachep);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
remove_proc_entry(EXT4_ROOT, proc_root_fs); remove_proc_entry("fs/ext4", NULL);
#endif #endif
} }

4
fs/jfs/jfs_debug.c
View file

@ -89,7 +89,7 @@ void jfs_proc_init(void)
{ {
int i; int i;
if (!(base = proc_mkdir("jfs", proc_root_fs))) if (!(base = proc_mkdir("fs/jfs", NULL)))
return; return;
base->owner = THIS_MODULE; base->owner = THIS_MODULE;
@ -109,7 +109,7 @@ void jfs_proc_clean(void)
if (base) { if (base) {
for (i = 0; i < NPROCENT; i++) for (i = 0; i < NPROCENT; i++)
remove_proc_entry(Entries[i].name, base); remove_proc_entry(Entries[i].name, base);
remove_proc_entry("jfs", proc_root_fs); remove_proc_entry("fs/jfs", NULL);
} }
} }

6
fs/nfs/client.c
View file

@ -1500,7 +1500,7 @@ int __init nfs_fs_proc_init(void)
{ {
struct proc_dir_entry *p; struct proc_dir_entry *p;
proc_fs_nfs = proc_mkdir("nfsfs", proc_root_fs); proc_fs_nfs = proc_mkdir("fs/nfsfs", NULL);
if (!proc_fs_nfs) if (!proc_fs_nfs)
goto error_0; goto error_0;
@ -1526,7 +1526,7 @@ int __init nfs_fs_proc_init(void)
error_2: error_2:
remove_proc_entry("servers", proc_fs_nfs); remove_proc_entry("servers", proc_fs_nfs);
error_1: error_1:
remove_proc_entry("nfsfs", proc_root_fs); remove_proc_entry("fs/nfsfs", NULL);
error_0: error_0:
return -ENOMEM; return -ENOMEM;
} }
@ -1538,7 +1538,7 @@ void nfs_fs_proc_exit(void)
{ {
remove_proc_entry("volumes", proc_fs_nfs); remove_proc_entry("volumes", proc_fs_nfs);
remove_proc_entry("servers", proc_fs_nfs); remove_proc_entry("servers", proc_fs_nfs);
remove_proc_entry("nfsfs", proc_root_fs); remove_proc_entry("fs/nfsfs", NULL);
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */

5
fs/proc/root.c
View file

@ -22,7 +22,7 @@
#include "internal.h" #include "internal.h"
struct proc_dir_entry *proc_root_fs, *proc_root_driver; struct proc_dir_entry *proc_root_driver;
static int proc_test_super(struct super_block *sb, void *data) static int proc_test_super(struct super_block *sb, void *data)
{ {
@ -126,7 +126,7 @@ void __init proc_root_init(void)
#ifdef CONFIG_SYSVIPC #ifdef CONFIG_SYSVIPC
proc_mkdir("sysvipc", NULL); proc_mkdir("sysvipc", NULL);
#endif #endif
proc_root_fs = proc_mkdir("fs", NULL); proc_mkdir("fs", NULL);
proc_root_driver = proc_mkdir("driver", NULL); proc_root_driver = proc_mkdir("driver", NULL);
proc_mkdir("fs/nfsd", NULL); /* somewhere for the nfsd filesystem to be mounted */ proc_mkdir("fs/nfsd", NULL); /* somewhere for the nfsd filesystem to be mounted */
#if defined(CONFIG_SUN_OPENPROMFS) || defined(CONFIG_SUN_OPENPROMFS_MODULE) #if defined(CONFIG_SUN_OPENPROMFS) || defined(CONFIG_SUN_OPENPROMFS_MODULE)
@ -235,5 +235,4 @@ EXPORT_SYMBOL(create_proc_entry);
EXPORT_SYMBOL(proc_create); EXPORT_SYMBOL(proc_create);
EXPORT_SYMBOL(remove_proc_entry); EXPORT_SYMBOL(remove_proc_entry);
EXPORT_SYMBOL(proc_root); EXPORT_SYMBOL(proc_root);
EXPORT_SYMBOL(proc_root_fs);
EXPORT_SYMBOL(proc_root_driver); EXPORT_SYMBOL(proc_root_driver);

1
include/linux/proc_fs.h
View file

@ -97,7 +97,6 @@ struct vmcore {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern struct proc_dir_entry proc_root; extern struct proc_dir_entry proc_root;
extern struct proc_dir_entry *proc_root_fs;
extern struct proc_dir_entry *proc_root_driver; extern struct proc_dir_entry *proc_root_driver;
extern struct proc_dir_entry *proc_root_kcore; extern struct proc_dir_entry *proc_root_kcore;