Commit 36a5aeb8 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

proc: remove proc_root_fs 



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

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9c37066d

fs/cifs/cifs_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ cifs_proc_init(void) 
{

	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)

		return;
@@ -559,7 +559,7 @@ cifs_proc_clean(void) 
	remove_proc_entry("LinuxExtensionsEnabled", proc_fs_cifs);

	remove_proc_entry("Experimental", 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

fs/ext4/mballoc.c

+3 −4
Original line number Diff line number Diff line
@@ -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);

}



#define EXT4_ROOT			"ext4"

#define EXT4_MB_STATS_NAME		"stats"

#define EXT4_MB_MAX_TO_SCAN_NAME	"max_to_scan"

#define EXT4_MB_MIN_TO_SCAN_NAME	"min_to_scan"
@@ -3007,9 +3006,9 @@ int __init init_ext4_mballoc(void) 
		return -ENOMEM;

	}

#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)

		printk(KERN_ERR "EXT4-fs: Unable to create %s\n", EXT4_ROOT);

		printk(KERN_ERR "EXT4-fs: Unable to create fs/ext4\n");

#endif

	return 0;

}
@@ -3020,7 +3019,7 @@ void exit_ext4_mballoc(void) 
	kmem_cache_destroy(ext4_pspace_cachep);

	kmem_cache_destroy(ext4_ac_cachep);

#ifdef CONFIG_PROC_FS

	remove_proc_entry(EXT4_ROOT, proc_root_fs);

	remove_proc_entry("fs/ext4", NULL);

#endif

}

fs/jfs/jfs_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void jfs_proc_init(void) 
{

	int i;



	if (!(base = proc_mkdir("jfs", proc_root_fs)))

	if (!(base = proc_mkdir("fs/jfs", NULL)))

		return;

	base->owner = THIS_MODULE;
@@ -109,7 +109,7 @@ void jfs_proc_clean(void) 
	if (base) {

		for (i = 0; i < NPROCENT; i++)

			remove_proc_entry(Entries[i].name, base);

		remove_proc_entry("jfs", proc_root_fs);

		remove_proc_entry("fs/jfs", NULL);

	}

}

fs/nfs/client.c

+3 −3
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ int __init nfs_fs_proc_init(void) 
{

	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)

		goto error_0;
@@ -1526,7 +1526,7 @@ int __init nfs_fs_proc_init(void) 
error_2:

	remove_proc_entry("servers", proc_fs_nfs);

error_1:

	remove_proc_entry("nfsfs", proc_root_fs);

	remove_proc_entry("fs/nfsfs", NULL);

error_0:

	return -ENOMEM;

}
@@ -1538,7 +1538,7 @@ void nfs_fs_proc_exit(void) 
{

	remove_proc_entry("volumes", 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 */

fs/proc/root.c

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#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)

{
@@ -126,7 +126,7 @@ void __init proc_root_init(void) 
#ifdef CONFIG_SYSVIPC

	proc_mkdir("sysvipc", NULL);

#endif

	proc_root_fs = proc_mkdir("fs", NULL);

	proc_mkdir("fs", NULL);

	proc_root_driver = proc_mkdir("driver", NULL);

	proc_mkdir("fs/nfsd", NULL); /* somewhere for the nfsd filesystem to be mounted */

#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(remove_proc_entry);

EXPORT_SYMBOL(proc_root);

EXPORT_SYMBOL(proc_root_fs);

EXPORT_SYMBOL(proc_root_driver);