From: Adrian Bunk This patch makes some needlessly global code static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- 25-akpm/fs/hpfs/alloc.c | 4 +++- 25-akpm/fs/hpfs/dentry.c | 6 +++--- 25-akpm/fs/hpfs/dnode.c | 14 ++++++++------ 25-akpm/fs/hpfs/hpfs_fn.h | 4 ---- 25-akpm/fs/hpfs/inode.c | 2 +- 25-akpm/fs/hpfs/name.c | 4 ++-- 25-akpm/fs/hpfs/super.c | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff -puN fs/hpfs/alloc.c~fs-hpfs-make-some-code-static fs/hpfs/alloc.c --- 25/fs/hpfs/alloc.c~fs-hpfs-make-some-code-static 2005-02-02 18:21:06.342222424 -0800 +++ 25-akpm/fs/hpfs/alloc.c 2005-02-02 18:21:06.355220448 -0800 @@ -8,6 +8,8 @@ #include "hpfs_fn.h" +static int hpfs_alloc_if_possible_nolock(struct super_block *s, secno sec); + /* * Check if a sector is allocated in bitmap * This is really slow. Turned on only if chk==2 @@ -243,7 +245,7 @@ static secno alloc_in_dirband(struct sup /* Alloc sector if it's free */ -int hpfs_alloc_if_possible_nolock(struct super_block *s, secno sec) +static int hpfs_alloc_if_possible_nolock(struct super_block *s, secno sec) { struct quad_buffer_head qbh; unsigned *bmp; diff -puN fs/hpfs/dentry.c~fs-hpfs-make-some-code-static fs/hpfs/dentry.c --- 25/fs/hpfs/dentry.c~fs-hpfs-make-some-code-static 2005-02-02 18:21:06.343222272 -0800 +++ 25-akpm/fs/hpfs/dentry.c 2005-02-02 18:21:06.355220448 -0800 @@ -12,7 +12,7 @@ * Note: the dentry argument is the parent dentry. */ -int hpfs_hash_dentry(struct dentry *dentry, struct qstr *qstr) +static int hpfs_hash_dentry(struct dentry *dentry, struct qstr *qstr) { unsigned long hash; int i; @@ -34,7 +34,7 @@ int hpfs_hash_dentry(struct dentry *dent return 0; } -int hpfs_compare_dentry(struct dentry *dentry, struct qstr *a, struct qstr *b) +static int hpfs_compare_dentry(struct dentry *dentry, struct qstr *a, struct qstr *b) { unsigned al=a->len; unsigned bl=b->len; @@ -49,7 +49,7 @@ int hpfs_compare_dentry(struct dentry *d return 0; } -struct dentry_operations hpfs_dentry_operations = { +static struct dentry_operations hpfs_dentry_operations = { .d_hash = hpfs_hash_dentry, .d_compare = hpfs_compare_dentry, }; diff -puN fs/hpfs/dnode.c~fs-hpfs-make-some-code-static fs/hpfs/dnode.c --- 25/fs/hpfs/dnode.c~fs-hpfs-make-some-code-static 2005-02-02 18:21:06.345221968 -0800 +++ 25-akpm/fs/hpfs/dnode.c 2005-02-02 18:21:06.356220296 -0800 @@ -78,7 +78,7 @@ static void for_all_poss(struct inode *i return; } -void hpfs_pos_subst(loff_t *p, loff_t f, loff_t t) +static void hpfs_pos_subst(loff_t *p, loff_t f, loff_t t) { if (*p == f) *p = t; } @@ -88,7 +88,7 @@ void hpfs_pos_subst(loff_t *p, loff_t f, if ((*p & ~0x3f) == (f & ~0x3f)) *p = (t & ~0x3f) | (*p & 0x3f); }*/ -void hpfs_pos_ins(loff_t *p, loff_t d, loff_t c) +static void hpfs_pos_ins(loff_t *p, loff_t d, loff_t c) { if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { int n = (*p & 0x3f) + c; @@ -97,7 +97,7 @@ void hpfs_pos_ins(loff_t *p, loff_t d, l } } -void hpfs_pos_del(loff_t *p, loff_t d, loff_t c) +static void hpfs_pos_del(loff_t *p, loff_t d, loff_t c) { if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { int n = (*p & 0x3f) - c; @@ -189,7 +189,8 @@ struct hpfs_dirent *hpfs_add_de(struct s /* Delete dirent and don't care about its subtree */ -void hpfs_delete_de(struct super_block *s, struct dnode *d, struct hpfs_dirent *de) +static void hpfs_delete_de(struct super_block *s, struct dnode *d, + struct hpfs_dirent *de) { if (de->last) { hpfs_error(s, "attempt to delete last dirent in dnode %08x", d->self); @@ -221,8 +222,9 @@ static void fix_up_ptrs(struct super_blo /* Add an entry to dnode and do dnode splitting if required */ -int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, unsigned char *name, unsigned namelen, - struct hpfs_dirent *new_de, dnode_secno down_ptr) +static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, + unsigned char *name, unsigned namelen, + struct hpfs_dirent *new_de, dnode_secno down_ptr) { struct quad_buffer_head qbh, qbh1, qbh2; struct dnode *d, *ad, *rd, *nd = NULL; diff -puN fs/hpfs/hpfs_fn.h~fs-hpfs-make-some-code-static fs/hpfs/hpfs_fn.h --- 25/fs/hpfs/hpfs_fn.h~fs-hpfs-make-some-code-static 2005-02-02 18:21:06.347221664 -0800 +++ 25-akpm/fs/hpfs/hpfs_fn.h 2005-02-02 18:21:06.357220144 -0800 @@ -202,7 +202,6 @@ static inline unsigned tstbits(unsigned int hpfs_chk_sectors(struct super_block *, secno, int, char *); secno hpfs_alloc_sector(struct super_block *, secno, unsigned, int, int); -int hpfs_alloc_if_possible_nolock(struct super_block *, secno); int hpfs_alloc_if_possible(struct super_block *, secno); void hpfs_free_sectors(struct super_block *, secno, unsigned); int hpfs_check_free_dnodes(struct super_block *, int); @@ -247,8 +246,6 @@ extern struct file_operations hpfs_dir_o void hpfs_add_pos(struct inode *, loff_t *); void hpfs_del_pos(struct inode *, loff_t *); struct hpfs_dirent *hpfs_add_de(struct super_block *, struct dnode *, unsigned char *, unsigned, secno); -void hpfs_delete_de(struct super_block *, struct dnode *, struct hpfs_dirent *); -int hpfs_add_to_dnode(struct inode *, dnode_secno, unsigned char *, unsigned, struct hpfs_dirent *, dnode_secno); int hpfs_add_dirent(struct inode *, unsigned char *, unsigned, struct hpfs_dirent *, int); int hpfs_remove_dirent(struct inode *, dnode_secno, struct hpfs_dirent *, struct quad_buffer_head *, int); void hpfs_count_dnodes(struct super_block *, dnode_secno, int *, int *, int *); @@ -276,7 +273,6 @@ extern struct address_space_operations h void hpfs_init_inode(struct inode *); void hpfs_read_inode(struct inode *); -void hpfs_write_inode_ea(struct inode *, struct fnode *); void hpfs_write_inode(struct inode *); void hpfs_write_inode_nolock(struct inode *); int hpfs_notify_change(struct dentry *, struct iattr *); diff -puN fs/hpfs/inode.c~fs-hpfs-make-some-code-static fs/hpfs/inode.c --- 25/fs/hpfs/inode.c~fs-hpfs-make-some-code-static 2005-02-02 18:21:06.348221512 -0800 +++ 25-akpm/fs/hpfs/inode.c 2005-02-02 18:21:06.357220144 -0800 @@ -141,7 +141,7 @@ void hpfs_read_inode(struct inode *i) brelse(bh); } -void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode) +static void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode) { struct hpfs_inode_info *hpfs_inode = hpfs_i(i); /*if (fnode->acl_size_l || fnode->acl_size_s) { diff -puN fs/hpfs/name.c~fs-hpfs-make-some-code-static fs/hpfs/name.c --- 25/fs/hpfs/name.c~fs-hpfs-make-some-code-static 2005-02-02 18:21:06.350221208 -0800 +++ 25-akpm/fs/hpfs/name.c 2005-02-02 18:21:06.358219992 -0800 @@ -8,12 +8,12 @@ #include "hpfs_fn.h" -char *text_postfix[]={ +static char *text_postfix[]={ ".ASM", ".BAS", ".BAT", ".C", ".CC", ".CFG", ".CMD", ".CON", ".CPP", ".DEF", ".DOC", ".DPR", ".ERX", ".H", ".HPP", ".HTM", ".HTML", ".JAVA", ".LOG", ".PAS", ".RC", ".TEX", ".TXT", ".Y", ""}; -char *text_prefix[]={ +static char *text_prefix[]={ "AUTOEXEC.", "CHANGES", "COPYING", "CONFIG.", "CREDITS", "FAQ", "FILE_ID.DIZ", "MAKEFILE", "READ.ME", "README", "TERMCAP", ""}; diff -puN fs/hpfs/super.c~fs-hpfs-make-some-code-static fs/hpfs/super.c --- 25/fs/hpfs/super.c~fs-hpfs-make-some-code-static 2005-02-02 18:21:06.351221056 -0800 +++ 25-akpm/fs/hpfs/super.c 2005-02-02 18:21:06.359219840 -0800 @@ -246,9 +246,9 @@ static match_table_t tokens = { {Opt_err, NULL}, }; -int parse_opts(char *opts, uid_t *uid, gid_t *gid, umode_t *umask, - int *lowercase, int *conv, int *eas, int *chk, int *errs, - int *chkdsk, int *timeshift) +static int parse_opts(char *opts, uid_t *uid, gid_t *gid, umode_t *umask, + int *lowercase, int *conv, int *eas, int *chk, int *errs, + int *chkdsk, int *timeshift) { char *p; int option; _