Commit 904e812931f001b984912b2d2f653ea69520313c
Committed by
Linus Torvalds
Linus Torvalds
1 parent
f3e2a520f5
Exists in
master
and in
7 other branches
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>
Showing 3 changed files with 0 additions and 48 deletions Side-by-side Diff
fs/reiserfs/procfs.c
| ... | ... | @@ -48,14 +48,6 @@ |
| 48 | 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 | 51 | #define SF( x ) ( r -> x ) |
| 60 | 52 | #define SFP( x ) SF( s_proc_info_data.x ) |
| 61 | 53 | #define SFPL( x ) SFP( x[ level ] ) |
| ... | ... | @@ -538,19 +530,6 @@ |
| 538 | 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 | 533 | int reiserfs_proc_info_global_init(void) |
| 555 | 534 | { |
| 556 | 535 | if (proc_info_root == NULL) { |
| ... | ... | @@ -585,16 +564,6 @@ |
| 585 | 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 | 567 | int reiserfs_proc_info_global_init(void) |
| 599 | 568 | { |
| 600 | 569 | return 0; |
| ... | ... | @@ -603,14 +572,6 @@ |
| 603 | 572 | { |
| 604 | 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 | 575 | /* REISERFS_PROC_INFO */ |
| 615 | 576 | #endif |
| 616 | 577 |
fs/reiserfs/super.c
| ... | ... | @@ -2222,8 +2222,6 @@ |
| 2222 | 2222 | } |
| 2223 | 2223 | |
| 2224 | 2224 | reiserfs_proc_info_global_init(); |
| 2225 | - reiserfs_proc_register_global("version", | |
| 2226 | - reiserfs_global_version_in_proc); | |
| 2227 | 2225 | |
| 2228 | 2226 | ret = register_filesystem(&reiserfs_fs_type); |
| 2229 | 2227 | |
| ... | ... | @@ -2231,7 +2229,6 @@ |
| 2231 | 2229 | return 0; |
| 2232 | 2230 | } |
| 2233 | 2231 | |
| 2234 | - reiserfs_proc_unregister_global("version"); | |
| 2235 | 2232 | reiserfs_proc_info_global_done(); |
| 2236 | 2233 | destroy_inodecache(); |
| 2237 | 2234 | |
| ... | ... | @@ -2240,7 +2237,6 @@ |
| 2240 | 2237 | |
| 2241 | 2238 | static void __exit exit_reiserfs_fs(void) |
| 2242 | 2239 | { |
| 2243 | - reiserfs_proc_unregister_global("version"); | |
| 2244 | 2240 | reiserfs_proc_info_global_done(); |
| 2245 | 2241 | unregister_filesystem(&reiserfs_fs_type); |
| 2246 | 2242 | destroy_inodecache(); |
include/linux/reiserfs_fs.h
| ... | ... | @@ -2061,13 +2061,8 @@ |
| 2061 | 2061 | |
| 2062 | 2062 | int reiserfs_proc_info_init(struct super_block *sb); |
| 2063 | 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 | 2064 | int reiserfs_proc_info_global_init(void); |
| 2068 | 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 | 2067 | #if defined( REISERFS_PROC_INFO ) |
| 2073 | 2068 |