reiserfs: don't compile procfs.o at all if no support (e3c96f53) · Commits · e / devices / android_kernel_teracube_2e

fs/reiserfs/Makefile

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 \		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 \		super.o prints.o objectid.o lbalance.o ibalance.o stree.o \
	hashes.o tail_conversion.o journal.o resize.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)		ifeq ($(CONFIG_REISERFS_FS_XATTR),y)
	reiserfs-objs += xattr_user.o xattr_trusted.o		reiserfs-objs += xattr_user.o xattr_trusted.o

fs/reiserfs/procfs.c

+0 −26

Original line number	Original line	Diff line number	Diff line
	@@ -17,8 +17,6 @@
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/proc_fs.h>		#include <linux/proc_fs.h>

	#ifdef CONFIG_REISERFS_PROC_INFO

	/*		/*
	* LOCKING:		* LOCKING:
	*		*
	@@ -551,30 +549,6 @@ int reiserfs_proc_info_global_done(void)
	}		}
	return 0;		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		* Revision 1.1.8.2 2001/07/15 17:08:42 god
	* . use get_super() in procfs.c		* . use get_super() in procfs.c

include/linux/reiserfs_fs.h

+21 −9

Original line number	Original line	Diff line number	Diff line
	@@ -2051,21 +2051,13 @@ void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
	int search_by_entry_key(struct super_block sb, const struct cpu_key key,		int search_by_entry_key(struct super_block sb, const struct cpu_key key,
	struct treepath path, struct reiserfs_dir_entry de);		struct treepath path, struct reiserfs_dir_entry de);
	struct dentry reiserfs_get_parent(struct dentry );		struct dentry reiserfs_get_parent(struct dentry );
	/* procfs.c */

	#if defined( CONFIG_PROC_FS ) && defined( CONFIG_REISERFS_PROC_INFO )
	#define REISERFS_PROC_INFO
	#else
	#undef REISERFS_PROC_INFO
	#endif

			#ifdef CONFIG_REISERFS_PROC_INFO
	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);
	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);

	#if defined( REISERFS_PROC_INFO )

	#define PROC_EXP( e ) e		#define PROC_EXP( e ) e

	#define __PINFO( sb ) REISERFS_SB(sb) -> s_proc_info_data		#define __PINFO( sb ) REISERFS_SB(sb) -> s_proc_info_data
	@@ -2079,6 +2071,26 @@ int reiserfs_proc_info_global_done(void);
	PROC_INFO_ADD( sb, free_at[ ( level ) ], B_FREE_SPACE( bh ) ); \		PROC_INFO_ADD( sb, free_at[ ( level ) ], B_FREE_SPACE( bh ) ); \
	PROC_INFO_ADD( sb, items_at[ ( level ) ], B_NR_ITEMS( bh ) )		PROC_INFO_ADD( sb, items_at[ ( level ) ], B_NR_ITEMS( bh ) )
	#else		#else
			static inline int reiserfs_proc_info_init(struct super_block *sb)
			{
			return 0;
			}

			static inline int reiserfs_proc_info_done(struct super_block *sb)
			{
			return 0;
			}

			static inline int reiserfs_proc_info_global_init(void)
			{
			return 0;
			}

			static inline int reiserfs_proc_info_global_done(void)
			{
			return 0;
			}

	#define PROC_EXP( e )		#define PROC_EXP( e )
	#define VOID_V ( ( void ) 0 )		#define VOID_V ( ( void ) 0 )
	#define PROC_INFO_MAX( sb, field, value ) VOID_V		#define PROC_INFO_MAX( sb, field, value ) VOID_V