From: Adrian Bunk - make the following needlessly global functions statis: - plugin/file/file_conversion.c: prepped_dclust_ok() - plugin/file/file_conversion.c: cryptcompress2unixfile() - #if 0 the following unused global functions: - plugin/file/cryptcompress.c: prepare_write_cryptcompress() - plugin/file/file_conversion.c: prot_delete_object_cryptcompress() Signed-off-by: Adrian Bunk Cc: Edward Shishkin Signed-off-by: Andrew Morton --- fs/reiser4/plugin/file/cryptcompress.c | 2 ++ fs/reiser4/plugin/file/file.h | 3 --- fs/reiser4/plugin/file/file_conversion.c | 8 +++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff -puN fs/reiser4/plugin/file/cryptcompress.c~fs-reiser4-possible-cleanups-2 fs/reiser4/plugin/file/cryptcompress.c --- a/fs/reiser4/plugin/file/cryptcompress.c~fs-reiser4-possible-cleanups-2 +++ a/fs/reiser4/plugin/file/cryptcompress.c @@ -3769,11 +3769,13 @@ int release_cryptcompress(struct inode * return 0; } +#if 0 int prepare_write_cryptcompress(struct file *file, struct page *page, unsigned from, unsigned to) { return prepare_write_common(file, page, from, to); } +#endif /* 0 */ /* diff -puN fs/reiser4/plugin/file/file.h~fs-reiser4-possible-cleanups-2 fs/reiser4/plugin/file/file.h --- a/fs/reiser4/plugin/file/file.h~fs-reiser4-possible-cleanups-2 +++ a/fs/reiser4/plugin/file/file.h @@ -203,8 +203,6 @@ ssize_t read_cryptcompress(struct file * ssize_t prot_read_cryptcompress(struct file *, char __user *buf, size_t read_amount, loff_t * off); -int prepare_write_cryptcompress(struct file *file, struct page *page, - unsigned from, unsigned to); ssize_t write_cryptcompress(struct file *, const char __user *buf, size_t write_amount, loff_t * off, int * conv); ssize_t prot_write_cryptcompress(struct file *, const char __user *buf, size_t write_amount, @@ -230,7 +228,6 @@ int key_by_inode_cryptcompress(struct in int create_cryptcompress(struct inode *, struct inode *, reiser4_object_create_data *); int delete_object_cryptcompress(struct inode *); -int prot_delete_object_cryptcompress(struct inode *); void init_inode_data_cryptcompress(struct inode *, reiser4_object_create_data *, int create); int cut_tree_worker_cryptcompress(tap_t *, const reiser4_key * from_key, diff -puN fs/reiser4/plugin/file/file_conversion.c~fs-reiser4-possible-cleanups-2 fs/reiser4/plugin/file/file_conversion.c --- a/fs/reiser4/plugin/file/file_conversion.c~fs-reiser4-possible-cleanups-2 +++ a/fs/reiser4/plugin/file/file_conversion.c @@ -247,7 +247,7 @@ static void finish_check_compressibility } #if REISER4_DEBUG -int prepped_dclust_ok(hint_t * hint) +static int prepped_dclust_ok(hint_t * hint) { reiser4_key key; coord_t * coord = &hint->ext_coord.coord; @@ -418,8 +418,8 @@ static int complete_file_conversion(stru /* do conversion */ -int cryptcompress2unixfile(struct file *file, struct inode * inode, - reiser4_cluster_t * clust) +static int cryptcompress2unixfile(struct file *file, struct inode * inode, + reiser4_cluster_t * clust) { int i; int result = 0; @@ -585,10 +585,12 @@ ssize_t prot_sendfile_cryptcompress(stru (file, ppos, count, actor, target)); } +#if 0 int prot_delete_object_cryptcompress(struct inode *inode) { return PROT_PASSIVE(int, delete_object, (inode)); } +#endif /* 0 */ /* Local variables: _