diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-12-15 19:46:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:20:06 -0500 |
| commit | 904e812931f001b984912b2d2f653ea69520313c (patch) | |
| tree | c09ae6040d59111bb75594248bdb6b1246e828f3 | |
| parent | f3e2a520f5fb1a1df033efd9c2e5eadb384aad9b (diff) | |
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: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/reiserfs/procfs.c | 39 | ||||
| -rw-r--r-- | fs/reiserfs/super.c | 4 | ||||
| -rw-r--r-- | include/linux/reiserfs_fs.h | 5 |
3 files changed, 0 insertions, 48 deletions
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c index 9229e5514a4e..0ebb11646526 100644 --- a/fs/reiserfs/procfs.c +++ b/fs/reiserfs/procfs.c | |||
| @@ -48,14 +48,6 @@ static int show_version(struct seq_file *m, struct super_block *sb) | |||
| 48 | return 0; | 48 | return 0; |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | int reiserfs_global_version_in_proc(char *buffer, char **start, off_t offset, | ||
| 52 | int count, int *eof, void *data) | ||
| 53 | { | ||
| 54 | *start = buffer; | ||
| 55 | *eof = 1; | ||
| 56 | return 0; | ||
| 57 | } | ||
| 58 | |||
| 59 | #define SF( x ) ( r -> x ) | 51 | #define SF( x ) ( r -> x ) |
| 60 | #define SFP( x ) SF( s_proc_info_data.x ) | 52 | #define SFP( x ) SF( s_proc_info_data.x ) |
| 61 | #define SFPL( x ) SFP( x[ level ] ) | 53 | #define SFPL( x ) SFP( x[ level ] ) |
| @@ -538,19 +530,6 @@ int reiserfs_proc_info_done(struct super_block *sb) | |||
| 538 | return 0; | 530 | return 0; |
| 539 | } | 531 | } |
| 540 | 532 | ||
| 541 | struct proc_dir_entry *reiserfs_proc_register_global(char *name, | ||
| 542 | read_proc_t * func) | ||
| 543 | { | ||
| 544 | return (proc_info_root) ? create_proc_read_entry(name, 0, | ||
| 545 | proc_info_root, | ||
| 546 | func, NULL) : NULL; | ||
| 547 | } | ||
| 548 | |||
| 549 | void reiserfs_proc_unregister_global(const char *name) | ||
| 550 | { | ||
| 551 | remove_proc_entry(name, proc_info_root); | ||
| 552 | } | ||
| 553 | |||
| 554 | int reiserfs_proc_info_global_init(void) | 533 | int reiserfs_proc_info_global_init(void) |
| 555 | { | 534 | { |
| 556 | if (proc_info_root == NULL) { | 535 | if (proc_info_root == NULL) { |
| @@ -585,16 +564,6 @@ int reiserfs_proc_info_done(struct super_block *sb) | |||
| 585 | return 0; | 564 | return 0; |
| 586 | } | 565 | } |
| 587 | 566 | ||
| 588 | struct proc_dir_entry *reiserfs_proc_register_global(char *name, | ||
| 589 | read_proc_t * func) | ||
| 590 | { | ||
| 591 | return NULL; | ||
| 592 | } | ||
| 593 | |||
| 594 | void reiserfs_proc_unregister_global(const char *name) | ||
| 595 | {; | ||
| 596 | } | ||
| 597 | |||
| 598 | int reiserfs_proc_info_global_init(void) | 567 | int reiserfs_proc_info_global_init(void) |
| 599 | { | 568 | { |
| 600 | return 0; | 569 | return 0; |
| @@ -603,14 +572,6 @@ int reiserfs_proc_info_global_done(void) | |||
| 603 | { | 572 | { |
| 604 | return 0; | 573 | return 0; |
| 605 | } | 574 | } |
| 606 | |||
| 607 | int reiserfs_global_version_in_proc(char *buffer, char **start, | ||
| 608 | off_t offset, | ||
| 609 | int count, int *eof, void *data) | ||
| 610 | { | ||
| 611 | return 0; | ||
| 612 | } | ||
| 613 | |||
| 614 | /* REISERFS_PROC_INFO */ | 575 | /* REISERFS_PROC_INFO */ |
| 615 | #endif | 576 | #endif |
| 616 | 577 | ||
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 339b0baf2af6..b4a7dd03bdb9 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
| @@ -2222,8 +2222,6 @@ static int __init init_reiserfs_fs(void) | |||
| 2222 | } | 2222 | } |
| 2223 | 2223 | ||
| 2224 | reiserfs_proc_info_global_init(); | 2224 | reiserfs_proc_info_global_init(); |
| 2225 | reiserfs_proc_register_global("version", | ||
| 2226 | reiserfs_global_version_in_proc); | ||
| 2227 | 2225 | ||
| 2228 | ret = register_filesystem(&reiserfs_fs_type); | 2226 | ret = register_filesystem(&reiserfs_fs_type); |
| 2229 | 2227 | ||
| @@ -2231,7 +2229,6 @@ static int __init init_reiserfs_fs(void) | |||
| 2231 | return 0; | 2229 | return 0; |
| 2232 | } | 2230 | } |
| 2233 | 2231 | ||
| 2234 | reiserfs_proc_unregister_global("version"); | ||
| 2235 | reiserfs_proc_info_global_done(); | 2232 | reiserfs_proc_info_global_done(); |
| 2236 | destroy_inodecache(); | 2233 | destroy_inodecache(); |
| 2237 | 2234 | ||
| @@ -2240,7 +2237,6 @@ static int __init init_reiserfs_fs(void) | |||
| 2240 | 2237 | ||
| 2241 | static void __exit exit_reiserfs_fs(void) | 2238 | static void __exit exit_reiserfs_fs(void) |
| 2242 | { | 2239 | { |
| 2243 | reiserfs_proc_unregister_global("version"); | ||
| 2244 | reiserfs_proc_info_global_done(); | 2240 | reiserfs_proc_info_global_done(); |
| 2245 | unregister_filesystem(&reiserfs_fs_type); | 2241 | unregister_filesystem(&reiserfs_fs_type); |
| 2246 | destroy_inodecache(); | 2242 | destroy_inodecache(); |
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index a05b4a20768d..f65ed0d3a920 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h | |||
| @@ -2061,13 +2061,8 @@ struct dentry *reiserfs_get_parent(struct dentry *); | |||
| 2061 | 2061 | ||
| 2062 | int reiserfs_proc_info_init(struct super_block *sb); | 2062 | int reiserfs_proc_info_init(struct super_block *sb); |
| 2063 | int reiserfs_proc_info_done(struct super_block *sb); | 2063 | int reiserfs_proc_info_done(struct super_block *sb); |
| 2064 | struct proc_dir_entry *reiserfs_proc_register_global(char *name, | ||
| 2065 | read_proc_t * func); | ||
| 2066 | void reiserfs_proc_unregister_global(const char *name); | ||
| 2067 | int reiserfs_proc_info_global_init(void); | 2064 | int reiserfs_proc_info_global_init(void); |
| 2068 | int reiserfs_proc_info_global_done(void); | 2065 | int reiserfs_proc_info_global_done(void); |
| 2069 | int reiserfs_global_version_in_proc(char *buffer, char **start, off_t offset, | ||
| 2070 | int count, int *eof, void *data); | ||
| 2071 | 2066 | ||
| 2072 | #if defined( REISERFS_PROC_INFO ) | 2067 | #if defined( REISERFS_PROC_INFO ) |
| 2073 | 2068 | ||
