Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 904e8129 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

reiserfs: remove /proc/fs/reiserfs/version 



/proc/fs/reiserfs/version is on the way of removing ->read_proc interface.
 It's empty however, so simply remove it instead of doing dummy
conversion.  It's hard to see what information userspace can extract from
empty file.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f3e2a520

fs/reiserfs/procfs.c

+0 −39
Original line number Original line Diff line number Diff line
@@ -48,14 +48,6 @@ static int show_version(struct seq_file *m, struct super_block *sb) 
	return 0;

	return 0;

}

}





int reiserfs_global_version_in_proc(char *buffer, char **start, off_t offset,

				    int count, int *eof, void *data)

{

	*start = buffer;

	*eof = 1;

	return 0;

}



#define SF( x ) ( r -> x )

#define SF( x ) ( r -> x )

#define SFP( x ) SF( s_proc_info_data.x )

#define SFP( x ) SF( s_proc_info_data.x )

#define SFPL( x ) SFP( x[ level ] )

#define SFPL( x ) SFP( x[ level ] )
@@ -538,19 +530,6 @@ int reiserfs_proc_info_done(struct super_block *sb) 
	return 0;

	return 0;

}

}





struct proc_dir_entry *reiserfs_proc_register_global(char *name,

						     read_proc_t * func)

{

	return (proc_info_root) ? create_proc_read_entry(name, 0,

							 proc_info_root,

							 func, NULL) : NULL;

}



void reiserfs_proc_unregister_global(const char *name)

{

	remove_proc_entry(name, proc_info_root);

}



int reiserfs_proc_info_global_init(void)

int reiserfs_proc_info_global_init(void)

{

{

	if (proc_info_root == NULL) {

	if (proc_info_root == NULL) {
@@ -585,16 +564,6 @@ int reiserfs_proc_info_done(struct super_block *sb) 
	return 0;

	return 0;

}

}





struct proc_dir_entry *reiserfs_proc_register_global(char *name,

						     read_proc_t * func)

{

	return NULL;

}



void reiserfs_proc_unregister_global(const char *name)

{;

}



int reiserfs_proc_info_global_init(void)

int reiserfs_proc_info_global_init(void)

{

{

	return 0;

	return 0;
@@ -603,14 +572,6 @@ int reiserfs_proc_info_global_done(void) 
{

{

	return 0;

	return 0;

}

}



int reiserfs_global_version_in_proc(char *buffer, char **start,

				    off_t offset,

				    int count, int *eof, void *data)

{

	return 0;

}



/* REISERFS_PROC_INFO */

/* REISERFS_PROC_INFO */

#endif

#endif

fs/reiserfs/super.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -2222,8 +2222,6 @@ static int __init init_reiserfs_fs(void) 
	}

	}





	reiserfs_proc_info_global_init();

	reiserfs_proc_info_global_init();

	reiserfs_proc_register_global("version",

				      reiserfs_global_version_in_proc);





	ret = register_filesystem(&reiserfs_fs_type);

	ret = register_filesystem(&reiserfs_fs_type);
@@ -2231,7 +2229,6 @@ static int __init init_reiserfs_fs(void) 
		return 0;

		return 0;

	}

	}





	reiserfs_proc_unregister_global("version");

	reiserfs_proc_info_global_done();

	reiserfs_proc_info_global_done();

	destroy_inodecache();

	destroy_inodecache();
@@ -2240,7 +2237,6 @@ static int __init init_reiserfs_fs(void) 




static void __exit exit_reiserfs_fs(void)

static void __exit exit_reiserfs_fs(void)

{

{

	reiserfs_proc_unregister_global("version");

	reiserfs_proc_info_global_done();

	reiserfs_proc_info_global_done();

	unregister_filesystem(&reiserfs_fs_type);

	unregister_filesystem(&reiserfs_fs_type);

	destroy_inodecache();

	destroy_inodecache();

include/linux/reiserfs_fs.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -2061,13 +2061,8 @@ struct dentry *reiserfs_get_parent(struct dentry *); 




int reiserfs_proc_info_init(struct super_block *sb);

int reiserfs_proc_info_init(struct super_block *sb);

int reiserfs_proc_info_done(struct super_block *sb);

int reiserfs_proc_info_done(struct super_block *sb);

struct proc_dir_entry *reiserfs_proc_register_global(char *name,

						     read_proc_t * func);

void reiserfs_proc_unregister_global(const char *name);

int reiserfs_proc_info_global_init(void);

int reiserfs_proc_info_global_init(void);

int reiserfs_proc_info_global_done(void);

int reiserfs_proc_info_global_done(void);

int reiserfs_global_version_in_proc(char *buffer, char **start, off_t offset,

				    int count, int *eof, void *data);





#if defined( REISERFS_PROC_INFO )

#if defined( REISERFS_PROC_INFO )