Browse Source

xfs: make several more functions static

Just minor housekeeping, a lot more functions can be trivially made
static; others could if we reordered things a bit...

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Alex Elder <aelder@sgi.com>
Eric Sandeen 15 years ago
parent
commit
5d77c0dc0c

+ 1 - 1
fs/xfs/linux-2.6/xfs_sync.c

@@ -351,7 +351,7 @@ xfs_commit_dummy_trans(
 	return error;
 	return error;
 }
 }
 
 
-int
+STATIC int
 xfs_sync_fsdata(
 xfs_sync_fsdata(
 	struct xfs_mount	*mp,
 	struct xfs_mount	*mp,
 	int			flags)
 	int			flags)

+ 0 - 1
fs/xfs/linux-2.6/xfs_sync.h

@@ -37,7 +37,6 @@ void xfs_syncd_stop(struct xfs_mount *mp);
 
 
 int xfs_sync_attr(struct xfs_mount *mp, int flags);
 int xfs_sync_attr(struct xfs_mount *mp, int flags);
 int xfs_sync_data(struct xfs_mount *mp, int flags);
 int xfs_sync_data(struct xfs_mount *mp, int flags);
-int xfs_sync_fsdata(struct xfs_mount *mp, int flags);
 
 
 int xfs_quiesce_data(struct xfs_mount *mp);
 int xfs_quiesce_data(struct xfs_mount *mp);
 void xfs_quiesce_attr(struct xfs_mount *mp);
 void xfs_quiesce_attr(struct xfs_mount *mp);

+ 1 - 1
fs/xfs/xfs_attr.c

@@ -197,7 +197,7 @@ xfs_attr_get(
 /*
 /*
  * Calculate how many blocks we need for the new attribute,
  * Calculate how many blocks we need for the new attribute,
  */
  */
-int
+STATIC int
 xfs_attr_calc_size(
 xfs_attr_calc_size(
 	struct xfs_inode 	*ip,
 	struct xfs_inode 	*ip,
 	int			namelen,
 	int			namelen,

+ 0 - 1
fs/xfs/xfs_attr.h

@@ -139,7 +139,6 @@ typedef struct xfs_attr_list_context {
 /*
 /*
  * Overall external interface routines.
  * Overall external interface routines.
  */
  */
-int xfs_attr_calc_size(struct xfs_inode *, int, int, int *);
 int xfs_attr_inactive(struct xfs_inode *dp);
 int xfs_attr_inactive(struct xfs_inode *dp);
 int xfs_attr_rmtval_get(struct xfs_da_args *args);
 int xfs_attr_rmtval_get(struct xfs_da_args *args);
 int xfs_attr_list_int(struct xfs_attr_list_context *);
 int xfs_attr_list_int(struct xfs_attr_list_context *);

+ 1 - 1
fs/xfs/xfs_bmap_btree.c

@@ -334,7 +334,7 @@ xfs_bmbt_disk_set_allf(
 /*
 /*
  * Set all the fields in a bmap extent record from the uncompressed form.
  * Set all the fields in a bmap extent record from the uncompressed form.
  */
  */
-void
+STATIC void
 xfs_bmbt_disk_set_all(
 xfs_bmbt_disk_set_all(
 	xfs_bmbt_rec_t	*r,
 	xfs_bmbt_rec_t	*r,
 	xfs_bmbt_irec_t *s)
 	xfs_bmbt_irec_t *s)

+ 0 - 1
fs/xfs/xfs_bmap_btree.h

@@ -223,7 +223,6 @@ extern void xfs_bmbt_set_startblock(xfs_bmbt_rec_host_t *r, xfs_fsblock_t v);
 extern void xfs_bmbt_set_startoff(xfs_bmbt_rec_host_t *r, xfs_fileoff_t v);
 extern void xfs_bmbt_set_startoff(xfs_bmbt_rec_host_t *r, xfs_fileoff_t v);
 extern void xfs_bmbt_set_state(xfs_bmbt_rec_host_t *r, xfs_exntst_t v);
 extern void xfs_bmbt_set_state(xfs_bmbt_rec_host_t *r, xfs_exntst_t v);
 
 
-extern void xfs_bmbt_disk_set_all(xfs_bmbt_rec_t *r, xfs_bmbt_irec_t *s);
 extern void xfs_bmbt_disk_set_allf(xfs_bmbt_rec_t *r, xfs_fileoff_t o,
 extern void xfs_bmbt_disk_set_allf(xfs_bmbt_rec_t *r, xfs_fileoff_t o,
 			xfs_fsblock_t b, xfs_filblks_t c, xfs_exntst_t v);
 			xfs_fsblock_t b, xfs_filblks_t c, xfs_exntst_t v);
 
 

+ 1 - 1
fs/xfs/xfs_dir2_node.c

@@ -65,7 +65,7 @@ static int xfs_dir2_node_addname_int(xfs_da_args_t *args,
 /*
 /*
  * Log entries from a freespace block.
  * Log entries from a freespace block.
  */
  */
-void
+STATIC void
 xfs_dir2_free_log_bests(
 xfs_dir2_free_log_bests(
 	xfs_trans_t		*tp,		/* transaction pointer */
 	xfs_trans_t		*tp,		/* transaction pointer */
 	xfs_dabuf_t		*bp,		/* freespace buffer */
 	xfs_dabuf_t		*bp,		/* freespace buffer */

+ 0 - 2
fs/xfs/xfs_dir2_node.h

@@ -75,8 +75,6 @@ xfs_dir2_db_to_fdindex(struct xfs_mount *mp, xfs_dir2_db_t db)
 	return ((db) % XFS_DIR2_MAX_FREE_BESTS(mp));
 	return ((db) % XFS_DIR2_MAX_FREE_BESTS(mp));
 }
 }
 
 
-extern void xfs_dir2_free_log_bests(struct xfs_trans *tp, struct xfs_dabuf *bp,
-				    int first, int last);
 extern int xfs_dir2_leaf_to_node(struct xfs_da_args *args,
 extern int xfs_dir2_leaf_to_node(struct xfs_da_args *args,
 				 struct xfs_dabuf *lbp);
 				 struct xfs_dabuf *lbp);
 extern xfs_dahash_t xfs_dir2_leafn_lasthash(struct xfs_dabuf *bp, int *count);
 extern xfs_dahash_t xfs_dir2_leafn_lasthash(struct xfs_dabuf *bp, int *count);

+ 0 - 5
fs/xfs/xfs_log_priv.h

@@ -443,14 +443,9 @@ typedef struct log {
 
 
 /* common routines */
 /* common routines */
 extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp);
 extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp);
-extern int	 xlog_find_tail(xlog_t	*log,
-				xfs_daddr_t *head_blk,
-				xfs_daddr_t *tail_blk);
 extern int	 xlog_recover(xlog_t *log);
 extern int	 xlog_recover(xlog_t *log);
 extern int	 xlog_recover_finish(xlog_t *log);
 extern int	 xlog_recover_finish(xlog_t *log);
 extern void	 xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int);
 extern void	 xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int);
-extern struct xfs_buf *xlog_get_bp(xlog_t *, int);
-extern void	 xlog_put_bp(struct xfs_buf *);
 
 
 extern kmem_zone_t	*xfs_log_ticket_zone;
 extern kmem_zone_t	*xfs_log_ticket_zone;
 
 

+ 3 - 3
fs/xfs/xfs_log_recover.c

@@ -68,7 +68,7 @@ STATIC void	xlog_recover_check_summary(xlog_t *);
 	((bbs + (log)->l_sectbb_mask + 1) & ~(log)->l_sectbb_mask) : (bbs) )
 	((bbs + (log)->l_sectbb_mask + 1) & ~(log)->l_sectbb_mask) : (bbs) )
 #define XLOG_SECTOR_ROUNDDOWN_BLKNO(log, bno)	((bno) & ~(log)->l_sectbb_mask)
 #define XLOG_SECTOR_ROUNDDOWN_BLKNO(log, bno)	((bno) & ~(log)->l_sectbb_mask)
 
 
-xfs_buf_t *
+STATIC xfs_buf_t *
 xlog_get_bp(
 xlog_get_bp(
 	xlog_t		*log,
 	xlog_t		*log,
 	int		nbblks)
 	int		nbblks)
@@ -88,7 +88,7 @@ xlog_get_bp(
 	return xfs_buf_get_noaddr(BBTOB(nbblks), log->l_mp->m_logdev_targp);
 	return xfs_buf_get_noaddr(BBTOB(nbblks), log->l_mp->m_logdev_targp);
 }
 }
 
 
-void
+STATIC void
 xlog_put_bp(
 xlog_put_bp(
 	xfs_buf_t	*bp)
 	xfs_buf_t	*bp)
 {
 {
@@ -805,7 +805,7 @@ xlog_find_head(
  * We could speed up search by using current head_blk buffer, but it is not
  * We could speed up search by using current head_blk buffer, but it is not
  * available.
  * available.
  */
  */
-int
+STATIC int
 xlog_find_tail(
 xlog_find_tail(
 	xlog_t			*log,
 	xlog_t			*log,
 	xfs_daddr_t		*head_blk,
 	xfs_daddr_t		*head_blk,