Skip to content

Commit

Permalink
reiserfs: remove /proc/fs/reiserfs/version
Browse files Browse the repository at this point in the history
/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: Alexey Dobriyan <[email protected]>
Cc: Jeff Mahoney <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Alexey Dobriyan authored and torvalds committed Dec 16, 2009
1 parent f3e2a52 commit 904e812
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 48 deletions.
39 changes: 0 additions & 39 deletions fs/reiserfs/procfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@ static int show_version(struct seq_file *m, struct super_block *sb)
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 SFP( x ) SF( s_proc_info_data.x )
#define SFPL( x ) SFP( x[ level ] )
Expand Down Expand Up @@ -538,19 +530,6 @@ int reiserfs_proc_info_done(struct super_block *sb)
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)
{
if (proc_info_root == NULL) {
Expand Down Expand Up @@ -585,16 +564,6 @@ int reiserfs_proc_info_done(struct super_block *sb)
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)
{
return 0;
Expand All @@ -603,14 +572,6 @@ int reiserfs_proc_info_global_done(void)
{
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 */
#endif

Expand Down
4 changes: 0 additions & 4 deletions fs/reiserfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -2222,16 +2222,13 @@ static int __init init_reiserfs_fs(void)
}

reiserfs_proc_info_global_init();
reiserfs_proc_register_global("version",
reiserfs_global_version_in_proc);

ret = register_filesystem(&reiserfs_fs_type);

if (ret == 0) {
return 0;
}

reiserfs_proc_unregister_global("version");
reiserfs_proc_info_global_done();
destroy_inodecache();

Expand All @@ -2240,7 +2237,6 @@ static int __init init_reiserfs_fs(void)

static void __exit exit_reiserfs_fs(void)
{
reiserfs_proc_unregister_global("version");
reiserfs_proc_info_global_done();
unregister_filesystem(&reiserfs_fs_type);
destroy_inodecache();
Expand Down
5 changes: 0 additions & 5 deletions include/linux/reiserfs_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2061,13 +2061,8 @@ struct dentry *reiserfs_get_parent(struct dentry *);

int reiserfs_proc_info_init(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_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 )

Expand Down

0 comments on commit 904e812

Please sign in to comment.