From: Adrian Bunk This patch contains the following possible cleanups: - make needlessly global code static - #if unused code away Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- fs/reiser4/estimate.c | 2 +- fs/reiser4/flush_queue.c | 2 ++ fs/reiser4/fsdata.c | 9 ++++++--- fs/reiser4/fsdata.h | 3 --- fs/reiser4/init_super.c | 4 +++- fs/reiser4/inode.c | 7 ++----- fs/reiser4/jnode.c | 2 ++ fs/reiser4/key.c | 2 ++ fs/reiser4/key.h | 1 - fs/reiser4/lock.c | 3 +++ fs/reiser4/oid.c | 2 ++ fs/reiser4/plugin/file/cryptcompress.c | 4 ++++ fs/reiser4/plugin/file/file.h | 3 --- fs/reiser4/plugin/plugin.c | 12 ++++++------ fs/reiser4/plugin/plugin.h | 2 -- fs/reiser4/readahead.c | 3 +++ fs/reiser4/readahead.h | 1 - fs/reiser4/super.c | 2 ++ fs/reiser4/super.h | 4 ---- fs/reiser4/tree.c | 2 +- fs/reiser4/tree.h | 2 -- fs/reiser4/tree_walk.c | 4 ++++ fs/reiser4/tree_walk.h | 2 -- fs/reiser4/znode.h | 4 ---- 24 files changed, 43 insertions(+), 39 deletions(-) diff -puN fs/reiser4/estimate.c~fs-reiser4-possible-cleanups fs/reiser4/estimate.c --- devel/fs/reiser4/estimate.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/estimate.c 2005-12-22 05:10:04.000000000 -0800 @@ -70,7 +70,7 @@ reiser4_block_nr estimate_insert_flow(tr } /* returnes max number of nodes can be occupied by disk cluster */ -reiser4_block_nr estimate_cluster(struct inode * inode, int unprepped) +static reiser4_block_nr estimate_cluster(struct inode * inode, int unprepped) { int per_cluster; per_cluster = (unprepped ? 1 : cluster_nrpages(inode)); diff -puN fs/reiser4/flush_queue.c~fs-reiser4-possible-cleanups fs/reiser4/flush_queue.c --- devel/fs/reiser4/flush_queue.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/flush_queue.c 2005-12-22 05:10:04.000000000 -0800 @@ -646,6 +646,7 @@ void init_atom_fq_parts(txn_atom *atom) INIT_LIST_HEAD(&atom->flush_queues); } +#ifdef REISER4_USE_EFLUSH /* get a flush queue for an atom pointed by given jnode (spin-locked) ; returns * both atom and jnode locked and found and took exclusive access for flush * queue object. */ @@ -709,6 +710,7 @@ int fq_by_jnode_gfp(jnode * node, flush_ return 0; } +#endif /* REISER4_USE_EFLUSH */ #if REISER4_DEBUG diff -puN fs/reiser4/fsdata.c~fs-reiser4-possible-cleanups fs/reiser4/fsdata.c --- devel/fs/reiser4/fsdata.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/fsdata.c 2005-12-22 05:10:04.000000000 -0800 @@ -18,6 +18,9 @@ static unsigned long d_cursor_unused = 0 /* spinlock protecting manipulations with dir_cursor's hash table and lists */ spinlock_t d_lock = SPIN_LOCK_UNLOCKED; +static reiser4_file_fsdata *create_fsdata(struct file *file); +static int file_is_stateless(struct file *file); +static void free_fsdata(reiser4_file_fsdata *fsdata); static void kill_cursor(dir_cursor *); /** @@ -482,7 +485,7 @@ void kill_cursors(struct inode *inode) * one file system operation. This means that there may be "detached state" * for underlying inode. */ -int file_is_stateless(struct file *file) +static int file_is_stateless(struct file *file) { return reiser4_get_dentry_fsdata(file->f_dentry)->stateless; } @@ -688,7 +691,7 @@ void done_file_fsdata(void) * * Allocates and initializes reiser4_file_fsdata structure. */ -reiser4_file_fsdata *create_fsdata(struct file *file) +static reiser4_file_fsdata *create_fsdata(struct file *file) { reiser4_file_fsdata *fsdata; @@ -708,7 +711,7 @@ reiser4_file_fsdata *create_fsdata(struc * * Dual to create_fsdata(). Free reiser4_file_fsdata. */ -void free_fsdata(reiser4_file_fsdata *fsdata) +static void free_fsdata(reiser4_file_fsdata *fsdata) { BUG_ON(fsdata == NULL); kmem_cache_free(file_fsdata_cache, fsdata); diff -puN fs/reiser4/fsdata.h~fs-reiser4-possible-cleanups fs/reiser4/fsdata.h --- devel/fs/reiser4/fsdata.h~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/fsdata.h 2005-12-22 05:10:04.000000000 -0800 @@ -135,8 +135,6 @@ extern int init_file_fsdata(void); extern void done_file_fsdata(void); extern reiser4_file_fsdata *reiser4_get_file_fsdata(struct file *); extern void reiser4_free_file_fsdata(struct file *); -extern reiser4_file_fsdata *create_fsdata(struct file *); -extern void free_fsdata(reiser4_file_fsdata *); /* @@ -182,7 +180,6 @@ extern void done_d_cursor(void); extern int init_super_d_info(struct super_block *); extern void done_super_d_info(struct super_block *); -extern int file_is_stateless(struct file *); extern loff_t get_dir_fpos(struct file *); extern int try_to_attach_fsdata(struct file *, struct inode *); extern void detach_fsdata(struct file *); diff -puN fs/reiser4/init_super.c~fs-reiser4-possible-cleanups fs/reiser4/init_super.c --- devel/fs/reiser4/init_super.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/init_super.c 2005-12-22 05:10:04.000000000 -0800 @@ -667,7 +667,7 @@ static struct { }; /* access to default plugin table */ -reiser4_plugin *get_default_plugin(pset_member memb) +static reiser4_plugin *get_default_plugin(pset_member memb) { return plugin_by_id(default_plugins[memb].type, default_plugins[memb].id); @@ -734,6 +734,7 @@ int init_root_inode(struct super_block * * * Puts inode of root directory. */ +#if 0 void done_root_inode(struct super_block *super) { /* remove unused children of the parent dentry */ @@ -744,6 +745,7 @@ void done_root_inode(struct super_block /* discard all inodes of filesystem */ invalidate_inodes(super); } +#endif /* 0 */ /* * Local variables: diff -puN fs/reiser4/inode.c~fs-reiser4-possible-cleanups fs/reiser4/inode.c --- devel/fs/reiser4/inode.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/inode.c 2005-12-22 05:10:04.000000000 -0800 @@ -109,17 +109,14 @@ int reiser4_max_filename_len(const struc return 255; } +#if REISER4_USE_COLLISION_LIMIT /* Maximal number of hash collisions for this directory. */ int max_hash_collisions(const struct inode *dir /* inode queried */ ) { assert("nikita-1711", dir != NULL); -#if REISER4_USE_COLLISION_LIMIT return reiser4_inode_data(dir)->plugin.max_collisions; -#else - (void)dir; - return ~0; -#endif } +#endif /* REISER4_USE_COLLISION_LIMIT */ /* Install file, inode, and address_space operation on @inode, depending on its mode. */ diff -puN fs/reiser4/jnode.c~fs-reiser4-possible-cleanups fs/reiser4/jnode.c --- devel/fs/reiser4/jnode.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/jnode.c 2005-12-22 05:10:04.000000000 -0800 @@ -1927,6 +1927,7 @@ void info_jnode(const char *prefix /* pr #endif /* REISER4_DEBUG */ +#ifdef REISER4_COPY_ON_CAPTURE /* this is only used to created jnode during capture copy */ jnode *jclone(jnode * node) { @@ -1942,6 +1943,7 @@ jnode *jclone(jnode * node) JF_SET(clone, JNODE_CC); return clone; } +#endif /* REISER4_COPY_ON_CAPTURE */ /* Make Linus happy. Local variables: diff -puN fs/reiser4/key.c~fs-reiser4-possible-cleanups fs/reiser4/key.c --- devel/fs/reiser4/key.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/key.c 2005-12-22 05:10:04.000000000 -0800 @@ -126,6 +126,7 @@ void print_key(const char *prefix /* pre #endif +#if 0 /* like print_key() but outputs key representation into @buffer. */ int sprintf_key(char *buffer /* buffer to print key into */ , const reiser4_key * key /* key to print */ ) @@ -146,6 +147,7 @@ int sprintf_key(char *buffer /* buffer t (unsigned long long)get_key_objectid(key), (unsigned long long)get_key_offset(key)); } +#endif /* 0 */ /* Make Linus happy. Local variables: diff -puN fs/reiser4/key.h~fs-reiser4-possible-cleanups fs/reiser4/key.h --- devel/fs/reiser4/key.h~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/key.h 2005-12-22 05:10:04.000000000 -0800 @@ -364,7 +364,6 @@ static inline void prefetchkey(reiser4_k /* size of a buffer suitable to hold human readable key representation */ #define KEY_BUF_LEN (80) -extern int sprintf_key(char *buffer, const reiser4_key * key); #if REISER4_DEBUG extern void print_key(const char *prefix, const reiser4_key * key); #else diff -puN fs/reiser4/lock.c~fs-reiser4-possible-cleanups fs/reiser4/lock.c --- devel/fs/reiser4/lock.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/lock.c 2005-12-22 05:10:04.000000000 -0800 @@ -1182,6 +1182,8 @@ int lock_stack_isclean(lock_stack * owne } #if REISER4_DEBUG + +#if 0 /* Debugging help */ void print_lock_stack(const char *prefix, lock_stack * owner) { @@ -1211,6 +1213,7 @@ void print_lock_stack(const char *prefix spin_unlock_stack(owner); } +#endif /* 0 */ /* * debugging functions diff -puN fs/reiser4/oid.c~fs-reiser4-possible-cleanups fs/reiser4/oid.c --- devel/fs/reiser4/oid.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/oid.c 2005-12-22 05:10:04.000000000 -0800 @@ -100,6 +100,7 @@ long oids_used(const struct super_block return (long)-1; } +#if 0 /* * return number of "free" oids. This is used by statfs(2) to report "free" * inodes. @@ -119,6 +120,7 @@ long oids_free(const struct super_block else return (long)-1; } +#endif /* 0 */ /* * Count oid as allocated in atom. This is done after call to oid_allocate() diff -puN fs/reiser4/plugin/file/cryptcompress.c~fs-reiser4-possible-cleanups fs/reiser4/plugin/file/cryptcompress.c --- devel/fs/reiser4/plugin/file/cryptcompress.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/plugin/file/cryptcompress.c 2005-12-22 05:10:04.000000000 -0800 @@ -1221,6 +1221,7 @@ int readpage_cryptcompress(struct file * return result; } +#if 0 /* plugin->readpages() */ void readpages_cryptcompress(struct file *file, struct address_space *mapping, @@ -1244,6 +1245,7 @@ readpages_cryptcompress(struct file *fil return; } +#endif /* 0 */ /* how much pages will be captured */ static int cluster_nrpages_to_capture(reiser4_cluster_t * clust) @@ -3655,6 +3657,7 @@ int mmap_cryptcompress(struct file *file /* plugin->u.file.release */ /* plugin->u.file.get_block */ +#if 0 /* implentation of vfs' bmap method of struct address_space_operations for cryptcompress plugin */ @@ -3717,6 +3720,7 @@ sector_t bmap_cryptcompress(struct addre return result; } } +#endif /* 0 */ /* this is implementation of delete method of file plugin for cryptcompress objects */ diff -puN fs/reiser4/plugin/file/file.h~fs-reiser4-possible-cleanups fs/reiser4/plugin/file/file.h --- devel/fs/reiser4/plugin/file/file.h~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/plugin/file/file.h 2005-12-22 05:10:04.000000000 -0800 @@ -189,9 +189,6 @@ ssize_t sendfile_cryptcompress(struct fi extern int readpage_cryptcompress(struct file *, struct page *); extern int writepages_cryptcompress(struct address_space *, struct writeback_control *); -extern void readpages_cryptcompress(struct file *, struct address_space *, - struct list_head *pages); -extern sector_t bmap_cryptcompress(struct address_space *, sector_t lblock); /* file plugin operations */ diff -puN fs/reiser4/plugin/plugin.c~fs-reiser4-possible-cleanups fs/reiser4/plugin/plugin.c --- devel/fs/reiser4/plugin/plugin.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/plugin/plugin.c 2005-12-22 05:10:04.000000000 -0800 @@ -186,14 +186,8 @@ NIKTIA-FIXME-HANS: Do the line above. I /* initialise plugin sub-system. Just call this once on reiser4 startup. */ int init_plugins(void); int setup_plugins(struct super_block *super, reiser4_plugin ** area); -reiser4_plugin *lookup_plugin(const char *type_label, const char *plug_label); int locate_plugin(struct inode *inode, plugin_locator * loc); -/* internal functions. */ - -static reiser4_plugin_type find_type(const char *label); -static reiser4_plugin *find_plugin(reiser4_plugin_type_data * ptype, - const char *label); /** * init_plugins - initialize plugins @@ -257,6 +251,7 @@ int is_plugin_id_valid(reiser4_plugin_ty return id < plugins[type_id].builtin_num; } +#if 0 /* lookup plugin by scanning tables */ reiser4_plugin *lookup_plugin(const char *type_label /* plugin type label */ , const char *plug_label /* plugin label */ ) @@ -274,6 +269,7 @@ reiser4_plugin *lookup_plugin(const char result = NULL; return result; } +#endif /* 0 */ /* return plugin by its @type_id and @id. @@ -329,6 +325,8 @@ struct list_head *get_plugin_list(reiser return &plugins[type_id].plugins_list; } +#if 0 + /* find plugin type by label */ static reiser4_plugin_type find_type(const char *label /* plugin type * label */ ) @@ -370,6 +368,8 @@ static reiser4_plugin *find_plugin(reise return NULL; } +#endif /* 0 */ + int grab_plugin(struct inode *self, struct inode *ancestor, pset_member memb) { reiser4_plugin *plug; diff -puN fs/reiser4/plugin/plugin.h~fs-reiser4-possible-cleanups fs/reiser4/plugin/plugin.h --- devel/fs/reiser4/plugin/plugin.h~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/plugin/plugin.h 2005-12-22 05:10:04.000000000 -0800 @@ -678,8 +678,6 @@ struct reiser4_plugin_ops { /* stores plugin reference in reiser4-specific part of inode */ extern int set_object_plugin(struct inode *inode, reiser4_plugin_id id); extern int setup_plugins(struct super_block *super, reiser4_plugin ** area); -extern reiser4_plugin *lookup_plugin(const char *type_label, - const char *plug_label); extern int init_plugins(void); /* builtin plugins */ diff -puN fs/reiser4/readahead.c~fs-reiser4-possible-cleanups fs/reiser4/readahead.c --- devel/fs/reiser4/readahead.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/readahead.c 2005-12-22 05:10:04.000000000 -0800 @@ -116,6 +116,8 @@ void formatted_readahead(znode * node, r done_lh(&next_lh); } +#if 0 + static inline loff_t get_max_readahead(struct reiser4_file_ra_state *ra) { /* NOTE: ra->max_window_size is initialized in @@ -364,6 +366,7 @@ int reiser4_file_readahead(struct file * out: return 0; } +#endif /* 0 */ void reiser4_readdir_readahead_init(struct inode *dir, tap_t * tap) { diff -puN fs/reiser4/readahead.h~fs-reiser4-possible-cleanups fs/reiser4/readahead.h --- devel/fs/reiser4/readahead.h~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/readahead.h 2005-12-22 05:10:04.000000000 -0800 @@ -32,7 +32,6 @@ struct reiser4_file_ra_state { loff_t slow_start; /* enlarging r/a size algorithm. */ }; -extern int reiser4_file_readahead(struct file *, loff_t, size_t); extern void reiser4_readdir_readahead_init(struct inode *dir, tap_t * tap); /* __READAHEAD_H__ */ diff -puN fs/reiser4/super.c~fs-reiser4-possible-cleanups fs/reiser4/super.c --- devel/fs/reiser4/super.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/super.c 2005-12-22 05:10:04.000000000 -0800 @@ -120,6 +120,7 @@ __u32 reiser4_mkfs_id(const struct super return get_super_private(super)->mkfs_id; } +#if 0 /* set mkfs unique identifier */ void reiser4_set_mkfs_id(const struct super_block *super, __u32 id) { @@ -127,6 +128,7 @@ void reiser4_set_mkfs_id(const struct su assert("vpf-224", is_reiser4_super(super)); get_super_private(super)->mkfs_id = id; } +#endif /* 0 */ /* amount of free blocks in file system */ __u64 reiser4_free_committed_blocks(const struct super_block *super) diff -puN fs/reiser4/super.h~fs-reiser4-possible-cleanups fs/reiser4/super.h --- devel/fs/reiser4/super.h~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/super.h 2005-12-22 05:10:04.000000000 -0800 @@ -406,7 +406,6 @@ extern void reiser4_set_data_blocks(cons extern __u64 reiser4_free_blocks(const struct super_block *super); extern void reiser4_set_free_blocks(const struct super_block *super, __u64 nr); extern __u32 reiser4_mkfs_id(const struct super_block *super); -extern void reiser4_set_mkfs_id(const struct super_block *super, __u32 id); extern __u64 reiser4_free_committed_blocks(const struct super_block *super); @@ -433,7 +432,6 @@ extern int reiser4_blocknr_is_sane_for(c const reiser4_block_nr * blk); extern int reiser4_fill_super(struct super_block *s, void *data, int silent); extern int reiser4_done_super(struct super_block *s); -extern reiser4_plugin * get_default_plugin(pset_member memb); /* step of fill super */ extern int init_fs_info(struct super_block *); @@ -441,7 +439,6 @@ extern void done_fs_info(struct super_bl extern int init_super_data(struct super_block *, char *opt_string); extern int init_read_super(struct super_block *, int silent); extern int init_root_inode(struct super_block *); -extern void done_root_inode(struct super_block *); /* Maximal possible object id. */ @@ -455,7 +452,6 @@ oid_t oid_next(const struct super_block void oid_count_allocated(void); void oid_count_released(void); long oids_used(const struct super_block *); -long oids_free(const struct super_block *); #if REISER4_DEBUG void print_fs_info(const char *prefix, const struct super_block *); diff -puN fs/reiser4/tree.c~fs-reiser4-possible-cleanups fs/reiser4/tree.c --- devel/fs/reiser4/tree.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/tree.c 2005-12-22 05:10:04.000000000 -0800 @@ -1818,7 +1818,7 @@ cut_tree(reiser4_tree * tree, const reis } /* first step of reiser4 tree initialization */ -void init_tree_0(reiser4_tree * tree) +static void init_tree_0(reiser4_tree * tree) { assert("zam-683", tree != NULL); rwlock_init(&tree->tree_lock); diff -puN fs/reiser4/tree.h~fs-reiser4-possible-cleanups fs/reiser4/tree.h --- devel/fs/reiser4/tree.h~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/tree.h 2005-12-22 05:10:04.000000000 -0800 @@ -160,8 +160,6 @@ struct reiser4_tree { } carry; }; -extern void init_tree_0(reiser4_tree *); - extern int init_tree(reiser4_tree * tree, const reiser4_block_nr * root_block, tree_level height, node_plugin * default_plugin); diff -puN fs/reiser4/tree_walk.c~fs-reiser4-possible-cleanups fs/reiser4/tree_walk.c --- devel/fs/reiser4/tree_walk.c~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/tree_walk.c 2005-12-22 05:10:04.000000000 -0800 @@ -915,6 +915,8 @@ void sibling_list_insert_nolock(znode * assert("nikita-3281", check_sibling_list(before)); } +#if 0 + struct tw_handle { /* A key for tree walking (re)start, updated after each successful tree * node processing */ @@ -1242,6 +1244,8 @@ tree_walk(const reiser4_key * start_key, return ret; } +#endif /* 0 */ + /* Local variables: c-indentation-style: "K&R" diff -puN fs/reiser4/tree_walk.h~fs-reiser4-possible-cleanups fs/reiser4/tree_walk.h --- devel/fs/reiser4/tree_walk.h~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/tree_walk.h 2005-12-22 05:10:04.000000000 -0800 @@ -105,8 +105,6 @@ struct tree_walk_actor { * node or extent processing functions. */ int (*before) (void *); }; -extern int tree_walk(const reiser4_key *, int, struct tree_walk_actor *, - void *); #if REISER4_DEBUG int check_sibling_list(znode * node); diff -puN fs/reiser4/znode.h~fs-reiser4-possible-cleanups fs/reiser4/znode.h --- devel/fs/reiser4/znode.h~fs-reiser4-possible-cleanups 2005-12-22 05:10:04.000000000 -0800 +++ devel-akpm/fs/reiser4/znode.h 2005-12-22 05:10:04.000000000 -0800 @@ -237,12 +237,8 @@ extern void zfree(znode * node); #if REISER4_DEBUG extern void print_znode(const char *prefix, const znode * node); -extern void print_znodes(const char *prefix, reiser4_tree * tree); -extern void print_lock_stack(const char *prefix, lock_stack * owner); #else #define print_znode( p, n ) noop -#define print_znodes( p, t ) noop -#define print_lock_stack( p, o ) noop #endif /* Make it look like various znode functions exist instead of treating znodes as _