Commit 0b2355fe authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: No longer use 'extern' in function declarations 



For non-static function declarations, external linkage is implied and
the 'extern' keyword isn't needed.  Some static checkers complain about
the overuse of 'extern', so clean up all the function declarations.

In addition, remove 'extern' from the definition of
free_local_statfs_inodes(); it isn't needed there, either.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 062fb903

fs/gfs2/acl.h

+4 −4
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 


#define GFS2_ACL_MAX_ENTRIES(sdp) ((300 << (sdp)->sd_sb.sb_bsize_shift) >> 12)



extern struct posix_acl *gfs2_get_acl(struct inode *inode, int type, bool rcu);

extern int __gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type);

extern int gfs2_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,

struct posix_acl *gfs2_get_acl(struct inode *inode, int type, bool rcu);

int __gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type);

int gfs2_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,

		 struct posix_acl *acl, int type);



#endif /* __ACL_DOT_H__ */

fs/gfs2/aops.h

+3 −3
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 


#include "incore.h"



extern void adjust_fs_space(struct inode *inode);

extern void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio,

void adjust_fs_space(struct inode *inode);

void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio,

			     size_t from, size_t len);



#endif /* __AOPS_DOT_H__ */

fs/gfs2/bmap.h

+19 −19
Original line number Diff line number Diff line
@@ -46,24 +46,24 @@ static inline void gfs2_write_calc_reserv(const struct gfs2_inode *ip, 
extern const struct iomap_ops gfs2_iomap_ops;

extern const struct iomap_writeback_ops gfs2_writeback_ops;



extern int gfs2_unstuff_dinode(struct gfs2_inode *ip);

extern int gfs2_block_map(struct inode *inode, sector_t lblock,

int gfs2_unstuff_dinode(struct gfs2_inode *ip);

int gfs2_block_map(struct inode *inode, sector_t lblock,

		   struct buffer_head *bh, int create);

extern int gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length,

int gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length,

		   struct iomap *iomap);

extern int gfs2_iomap_alloc(struct inode *inode, loff_t pos, loff_t length,

int gfs2_iomap_alloc(struct inode *inode, loff_t pos, loff_t length,

		     struct iomap *iomap);

extern int gfs2_get_extent(struct inode *inode, u64 lblock, u64 *dblock,

int gfs2_get_extent(struct inode *inode, u64 lblock, u64 *dblock,

		    unsigned int *extlen);

extern int gfs2_alloc_extent(struct inode *inode, u64 lblock, u64 *dblock,

int gfs2_alloc_extent(struct inode *inode, u64 lblock, u64 *dblock,

		      unsigned *extlen, bool *new);

extern int gfs2_setattr_size(struct inode *inode, u64 size);

extern int gfs2_truncatei_resume(struct gfs2_inode *ip);

extern int gfs2_file_dealloc(struct gfs2_inode *ip);

extern int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset,

int gfs2_setattr_size(struct inode *inode, u64 size);

int gfs2_truncatei_resume(struct gfs2_inode *ip);

int gfs2_file_dealloc(struct gfs2_inode *ip);

int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset,

			      unsigned int len);

extern int gfs2_map_journal_extents(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd);

extern void gfs2_free_journal_extents(struct gfs2_jdesc *jd);

extern int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length);

int gfs2_map_journal_extents(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd);

void gfs2_free_journal_extents(struct gfs2_jdesc *jd);

int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length);



#endif /* __BMAP_DOT_H__ */

fs/gfs2/dir.h

+19 −19
Original line number Diff line number Diff line
@@ -23,32 +23,32 @@ struct gfs2_diradd { 
	int save_loc;

};



extern struct inode *gfs2_dir_search(struct inode *dir,

struct inode *gfs2_dir_search(struct inode *dir,

			      const struct qstr *filename,

			      bool fail_on_exist);

extern int gfs2_dir_check(struct inode *dir, const struct qstr *filename,

int gfs2_dir_check(struct inode *dir, const struct qstr *filename,

		   const struct gfs2_inode *ip);

extern int gfs2_dir_add(struct inode *inode, const struct qstr *filename,

int gfs2_dir_add(struct inode *inode, const struct qstr *filename,

		 const struct gfs2_inode *ip, struct gfs2_diradd *da);

static inline void gfs2_dir_no_add(struct gfs2_diradd *da)

{

	brelse(da->bh);

	da->bh = NULL;

}

extern int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry);

extern int gfs2_dir_read(struct inode *inode, struct dir_context *ctx,

int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry);

int gfs2_dir_read(struct inode *inode, struct dir_context *ctx,

		  struct file_ra_state *f_ra);

extern int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename,

int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename,

		   const struct gfs2_inode *nip, unsigned int new_type);



extern int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip);

int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip);



extern int gfs2_diradd_alloc_required(struct inode *dir,

int gfs2_diradd_alloc_required(struct inode *dir,

			       const struct qstr *filename,

			       struct gfs2_diradd *da);

extern int gfs2_dir_get_new_buffer(struct gfs2_inode *ip, u64 block,

int gfs2_dir_get_new_buffer(struct gfs2_inode *ip, u64 block,

			    struct buffer_head **bhp);

extern void gfs2_dir_hash_inval(struct gfs2_inode *ip);

void gfs2_dir_hash_inval(struct gfs2_inode *ip);



static inline u32 gfs2_disk_hash(const char *data, int len)

{

fs/gfs2/glock.h

+50 −50
Original line number Diff line number Diff line
@@ -166,14 +166,14 @@ static inline struct address_space *gfs2_glock2aspace(struct gfs2_glock *gl) 
	return NULL;

}



extern int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,

int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,

		   const struct gfs2_glock_operations *glops,

		   int create, struct gfs2_glock **glp);

extern struct gfs2_glock *gfs2_glock_hold(struct gfs2_glock *gl);

extern void gfs2_glock_put(struct gfs2_glock *gl);

extern void gfs2_glock_queue_put(struct gfs2_glock *gl);

struct gfs2_glock *gfs2_glock_hold(struct gfs2_glock *gl);

void gfs2_glock_put(struct gfs2_glock *gl);

void gfs2_glock_queue_put(struct gfs2_glock *gl);



extern void __gfs2_holder_init(struct gfs2_glock *gl, unsigned int state,

void __gfs2_holder_init(struct gfs2_glock *gl, unsigned int state,

		        u16 flags, struct gfs2_holder *gh,

		        unsigned long ip);

static inline void gfs2_holder_init(struct gfs2_glock *gl, unsigned int state,
@@ -181,25 +181,25 @@ static inline void gfs2_holder_init(struct gfs2_glock *gl, unsigned int state, 
	__gfs2_holder_init(gl, state, flags, gh, _RET_IP_);

}



extern void gfs2_holder_reinit(unsigned int state, u16 flags,

void gfs2_holder_reinit(unsigned int state, u16 flags,

		        struct gfs2_holder *gh);

extern void gfs2_holder_uninit(struct gfs2_holder *gh);

extern int gfs2_glock_nq(struct gfs2_holder *gh);

extern int gfs2_glock_poll(struct gfs2_holder *gh);

extern int gfs2_instantiate(struct gfs2_holder *gh);

extern int gfs2_glock_holder_ready(struct gfs2_holder *gh);

extern int gfs2_glock_wait(struct gfs2_holder *gh);

extern int gfs2_glock_async_wait(unsigned int num_gh, struct gfs2_holder *ghs);

extern void gfs2_glock_dq(struct gfs2_holder *gh);

extern void gfs2_glock_dq_wait(struct gfs2_holder *gh);

extern void gfs2_glock_dq_uninit(struct gfs2_holder *gh);

extern int gfs2_glock_nq_num(struct gfs2_sbd *sdp, u64 number,

void gfs2_holder_uninit(struct gfs2_holder *gh);

int gfs2_glock_nq(struct gfs2_holder *gh);

int gfs2_glock_poll(struct gfs2_holder *gh);

int gfs2_instantiate(struct gfs2_holder *gh);

int gfs2_glock_holder_ready(struct gfs2_holder *gh);

int gfs2_glock_wait(struct gfs2_holder *gh);

int gfs2_glock_async_wait(unsigned int num_gh, struct gfs2_holder *ghs);

void gfs2_glock_dq(struct gfs2_holder *gh);

void gfs2_glock_dq_wait(struct gfs2_holder *gh);

void gfs2_glock_dq_uninit(struct gfs2_holder *gh);

int gfs2_glock_nq_num(struct gfs2_sbd *sdp, u64 number,

		      const struct gfs2_glock_operations *glops,

		      unsigned int state, u16 flags,

		      struct gfs2_holder *gh);

extern int gfs2_glock_nq_m(unsigned int num_gh, struct gfs2_holder *ghs);

extern void gfs2_glock_dq_m(unsigned int num_gh, struct gfs2_holder *ghs);

extern void gfs2_dump_glock(struct seq_file *seq, struct gfs2_glock *gl,

int gfs2_glock_nq_m(unsigned int num_gh, struct gfs2_holder *ghs);

void gfs2_glock_dq_m(unsigned int num_gh, struct gfs2_holder *ghs);

void gfs2_dump_glock(struct seq_file *seq, struct gfs2_glock *gl,

			    bool fsid);

#define GLOCK_BUG_ON(gl,x) do { if (unlikely(x)) {		\

			gfs2_dump_glock(NULL, gl, true);	\
@@ -213,7 +213,7 @@ extern void gfs2_dump_glock(struct seq_file *seq, struct gfs2_glock *gl, 
			gfs2_assert_withdraw((gl)->gl_name.ln_sbd, (x)); } } \

	while (0)



extern __printf(2, 3)

__printf(2, 3)

void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...);



/**
@@ -241,27 +241,27 @@ static inline int gfs2_glock_nq_init(struct gfs2_glock *gl, 
	return error;

}



extern void gfs2_glock_cb(struct gfs2_glock *gl, unsigned int state);

extern void gfs2_glock_complete(struct gfs2_glock *gl, int ret);

extern bool gfs2_queue_try_to_evict(struct gfs2_glock *gl);

extern void gfs2_cancel_delete_work(struct gfs2_glock *gl);

extern void gfs2_flush_delete_work(struct gfs2_sbd *sdp);

extern void gfs2_gl_hash_clear(struct gfs2_sbd *sdp);

extern void gfs2_gl_dq_holders(struct gfs2_sbd *sdp);

extern void gfs2_glock_thaw(struct gfs2_sbd *sdp);

extern void gfs2_glock_add_to_lru(struct gfs2_glock *gl);

extern void gfs2_glock_free(struct gfs2_glock *gl);

void gfs2_glock_cb(struct gfs2_glock *gl, unsigned int state);

void gfs2_glock_complete(struct gfs2_glock *gl, int ret);

bool gfs2_queue_try_to_evict(struct gfs2_glock *gl);

void gfs2_cancel_delete_work(struct gfs2_glock *gl);

void gfs2_flush_delete_work(struct gfs2_sbd *sdp);

void gfs2_gl_hash_clear(struct gfs2_sbd *sdp);

void gfs2_gl_dq_holders(struct gfs2_sbd *sdp);

void gfs2_glock_thaw(struct gfs2_sbd *sdp);

void gfs2_glock_add_to_lru(struct gfs2_glock *gl);

void gfs2_glock_free(struct gfs2_glock *gl);



extern int __init gfs2_glock_init(void);

extern void gfs2_glock_exit(void);

int __init gfs2_glock_init(void);

void gfs2_glock_exit(void);



extern void gfs2_create_debugfs_file(struct gfs2_sbd *sdp);

extern void gfs2_delete_debugfs_file(struct gfs2_sbd *sdp);

extern void gfs2_register_debugfs(void);

extern void gfs2_unregister_debugfs(void);

void gfs2_create_debugfs_file(struct gfs2_sbd *sdp);

void gfs2_delete_debugfs_file(struct gfs2_sbd *sdp);

void gfs2_register_debugfs(void);

void gfs2_unregister_debugfs(void);



extern void glock_set_object(struct gfs2_glock *gl, void *object);

extern void glock_clear_object(struct gfs2_glock *gl, void *object);

void glock_set_object(struct gfs2_glock *gl, void *object);

void glock_clear_object(struct gfs2_glock *gl, void *object);



extern const struct lm_lockops gfs2_dlm_ops;
@@ -280,7 +280,7 @@ static inline bool gfs2_holder_queued(struct gfs2_holder *gh) 
	return !list_empty(&gh->gh_list);

}



extern void gfs2_inode_remember_delete(struct gfs2_glock *gl, u64 generation);

extern bool gfs2_inode_already_deleted(struct gfs2_glock *gl, u64 generation);

void gfs2_inode_remember_delete(struct gfs2_glock *gl, u64 generation);

bool gfs2_inode_already_deleted(struct gfs2_glock *gl, u64 generation);



#endif /* __GLOCK_DOT_H__ */