diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-12-15 16:46:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 07:20:06 -0800 |
commit | e3c96f53ac132743fda1384910feb863a2eab916 (patch) | |
tree | 48b97fdf50897d5ee97409db86bd4e4d7220be03 /fs | |
parent | 904e812931f001b984912b2d2f653ea69520313c (diff) | |
download | kernel_samsung_smdk4412-e3c96f53ac132743fda1384910feb863a2eab916.zip kernel_samsung_smdk4412-e3c96f53ac132743fda1384910feb863a2eab916.tar.gz kernel_samsung_smdk4412-e3c96f53ac132743fda1384910feb863a2eab916.tar.bz2 |
reiserfs: don't compile procfs.o at all if no support
* small define cleanup in header
* fix #ifdeffery in procfs.c via Kconfig
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/reiserfs/Makefile | 6 | ||||
-rw-r--r-- | fs/reiserfs/procfs.c | 26 |
2 files changed, 5 insertions, 27 deletions
diff --git a/fs/reiserfs/Makefile b/fs/reiserfs/Makefile index 6a9e30c..792b3cb 100644 --- a/fs/reiserfs/Makefile +++ b/fs/reiserfs/Makefile @@ -7,7 +7,11 @@ obj-$(CONFIG_REISERFS_FS) += reiserfs.o reiserfs-objs := bitmap.o do_balan.o namei.o inode.o file.o dir.o fix_node.o \ super.o prints.o objectid.o lbalance.o ibalance.o stree.o \ hashes.o tail_conversion.o journal.o resize.o \ - item_ops.o ioctl.o procfs.o xattr.o lock.o + item_ops.o ioctl.o xattr.o lock.o + +ifeq ($(CONFIG_REISERFS_PROC_INFO),y) +reiserfs-objs += procfs.o +endif ifeq ($(CONFIG_REISERFS_FS_XATTR),y) reiserfs-objs += xattr_user.o xattr_trusted.o diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c index 0ebb116..7a99811 100644 --- a/fs/reiserfs/procfs.c +++ b/fs/reiserfs/procfs.c @@ -17,8 +17,6 @@ #include <linux/init.h> #include <linux/proc_fs.h> -#ifdef CONFIG_REISERFS_PROC_INFO - /* * LOCKING: * @@ -551,30 +549,6 @@ int reiserfs_proc_info_global_done(void) } return 0; } - -/* REISERFS_PROC_INFO */ -#else - -int reiserfs_proc_info_init(struct super_block *sb) -{ - return 0; -} -int reiserfs_proc_info_done(struct super_block *sb) -{ - return 0; -} - -int reiserfs_proc_info_global_init(void) -{ - return 0; -} -int reiserfs_proc_info_global_done(void) -{ - return 0; -} -/* REISERFS_PROC_INFO */ -#endif - /* * Revision 1.1.8.2 2001/07/15 17:08:42 god * . use get_super() in procfs.c |