diff options
author | Eric Sandeen <sandeen@sandeen.net> | 2009-11-19 10:52:00 -0500 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-01-15 16:31:38 -0500 |
commit | 5d77c0dc0c05c2c65aee16149fae06831a118730 (patch) | |
tree | 742ac29243b5cd00b4e3cf2a01b6aec5046912ae /fs | |
parent | 6bded0f383fd7971b76ad6c194dda7d5b814b871 (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_sync.c | 2 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_sync.h | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_attr.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_attr.h | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_bmap_btree.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_bmap_btree.h | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2_node.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2_node.h | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_log_priv.h | 5 | ||||
-rw-r--r-- | fs/xfs/xfs_log_recover.c | 6 |
10 files changed, 7 insertions, 17 deletions
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c index 1f5e4bb5e970..0f90bfe2815f 100644 --- a/fs/xfs/linux-2.6/xfs_sync.c +++ b/fs/xfs/linux-2.6/xfs_sync.c | |||
@@ -351,7 +351,7 @@ xfs_commit_dummy_trans( | |||
351 | return error; | 351 | return error; |
352 | } | 352 | } |
353 | 353 | ||
354 | int | 354 | STATIC int |
355 | xfs_sync_fsdata( | 355 | xfs_sync_fsdata( |
356 | struct xfs_mount *mp, | 356 | struct xfs_mount *mp, |
357 | int flags) | 357 | int flags) |
diff --git a/fs/xfs/linux-2.6/xfs_sync.h b/fs/xfs/linux-2.6/xfs_sync.h index ea932b43335d..d480c346cabb 100644 --- a/fs/xfs/linux-2.6/xfs_sync.h +++ b/fs/xfs/linux-2.6/xfs_sync.h | |||
@@ -37,7 +37,6 @@ void xfs_syncd_stop(struct xfs_mount *mp); | |||
37 | 37 | ||
38 | int xfs_sync_attr(struct xfs_mount *mp, int flags); | 38 | int xfs_sync_attr(struct xfs_mount *mp, int flags); |
39 | int xfs_sync_data(struct xfs_mount *mp, int flags); | 39 | int xfs_sync_data(struct xfs_mount *mp, int flags); |
40 | int xfs_sync_fsdata(struct xfs_mount *mp, int flags); | ||
41 | 40 | ||
42 | int xfs_quiesce_data(struct xfs_mount *mp); | 41 | int xfs_quiesce_data(struct xfs_mount *mp); |
43 | void xfs_quiesce_attr(struct xfs_mount *mp); | 42 | void xfs_quiesce_attr(struct xfs_mount *mp); |
diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c index e953b6cfb2a8..9d11ebad43b6 100644 --- a/fs/xfs/xfs_attr.c +++ b/fs/xfs/xfs_attr.c | |||
@@ -197,7 +197,7 @@ xfs_attr_get( | |||
197 | /* | 197 | /* |
198 | * Calculate how many blocks we need for the new attribute, | 198 | * Calculate how many blocks we need for the new attribute, |
199 | */ | 199 | */ |
200 | int | 200 | STATIC int |
201 | xfs_attr_calc_size( | 201 | xfs_attr_calc_size( |
202 | struct xfs_inode *ip, | 202 | struct xfs_inode *ip, |
203 | int namelen, | 203 | int namelen, |
diff --git a/fs/xfs/xfs_attr.h b/fs/xfs/xfs_attr.h index 59b410ce69a1..9c3a24372914 100644 --- a/fs/xfs/xfs_attr.h +++ b/fs/xfs/xfs_attr.h | |||
@@ -139,7 +139,6 @@ typedef struct xfs_attr_list_context { | |||
139 | /* | 139 | /* |
140 | * Overall external interface routines. | 140 | * Overall external interface routines. |
141 | */ | 141 | */ |
142 | int xfs_attr_calc_size(struct xfs_inode *, int, int, int *); | ||
143 | int xfs_attr_inactive(struct xfs_inode *dp); | 142 | int xfs_attr_inactive(struct xfs_inode *dp); |
144 | int xfs_attr_rmtval_get(struct xfs_da_args *args); | 143 | int xfs_attr_rmtval_get(struct xfs_da_args *args); |
145 | int xfs_attr_list_int(struct xfs_attr_list_context *); | 144 | int xfs_attr_list_int(struct xfs_attr_list_context *); |
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c index 38751d5fac6f..416e47e54b83 100644 --- a/fs/xfs/xfs_bmap_btree.c +++ b/fs/xfs/xfs_bmap_btree.c | |||
@@ -334,7 +334,7 @@ xfs_bmbt_disk_set_allf( | |||
334 | /* | 334 | /* |
335 | * Set all the fields in a bmap extent record from the uncompressed form. | 335 | * Set all the fields in a bmap extent record from the uncompressed form. |
336 | */ | 336 | */ |
337 | void | 337 | STATIC void |
338 | xfs_bmbt_disk_set_all( | 338 | xfs_bmbt_disk_set_all( |
339 | xfs_bmbt_rec_t *r, | 339 | xfs_bmbt_rec_t *r, |
340 | xfs_bmbt_irec_t *s) | 340 | xfs_bmbt_irec_t *s) |
diff --git a/fs/xfs/xfs_bmap_btree.h b/fs/xfs/xfs_bmap_btree.h index cf07ca7c22e7..0e66c4ea0f85 100644 --- a/fs/xfs/xfs_bmap_btree.h +++ b/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); | |||
223 | extern void xfs_bmbt_set_startoff(xfs_bmbt_rec_host_t *r, xfs_fileoff_t v); | 223 | extern void xfs_bmbt_set_startoff(xfs_bmbt_rec_host_t *r, xfs_fileoff_t v); |
224 | extern void xfs_bmbt_set_state(xfs_bmbt_rec_host_t *r, xfs_exntst_t v); | 224 | extern void xfs_bmbt_set_state(xfs_bmbt_rec_host_t *r, xfs_exntst_t v); |
225 | 225 | ||
226 | extern void xfs_bmbt_disk_set_all(xfs_bmbt_rec_t *r, xfs_bmbt_irec_t *s); | ||
227 | extern void xfs_bmbt_disk_set_allf(xfs_bmbt_rec_t *r, xfs_fileoff_t o, | 226 | extern void xfs_bmbt_disk_set_allf(xfs_bmbt_rec_t *r, xfs_fileoff_t o, |
228 | xfs_fsblock_t b, xfs_filblks_t c, xfs_exntst_t v); | 227 | xfs_fsblock_t b, xfs_filblks_t c, xfs_exntst_t v); |
229 | 228 | ||
diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c index ce6e355199b5..78fc4d9ae756 100644 --- a/fs/xfs/xfs_dir2_node.c +++ b/fs/xfs/xfs_dir2_node.c | |||
@@ -65,7 +65,7 @@ static int xfs_dir2_node_addname_int(xfs_da_args_t *args, | |||
65 | /* | 65 | /* |
66 | * Log entries from a freespace block. | 66 | * Log entries from a freespace block. |
67 | */ | 67 | */ |
68 | void | 68 | STATIC void |
69 | xfs_dir2_free_log_bests( | 69 | xfs_dir2_free_log_bests( |
70 | xfs_trans_t *tp, /* transaction pointer */ | 70 | xfs_trans_t *tp, /* transaction pointer */ |
71 | xfs_dabuf_t *bp, /* freespace buffer */ | 71 | xfs_dabuf_t *bp, /* freespace buffer */ |
diff --git a/fs/xfs/xfs_dir2_node.h b/fs/xfs/xfs_dir2_node.h index dde72db3d695..82dfe7147195 100644 --- a/fs/xfs/xfs_dir2_node.h +++ b/fs/xfs/xfs_dir2_node.h | |||
@@ -75,8 +75,6 @@ xfs_dir2_db_to_fdindex(struct xfs_mount *mp, xfs_dir2_db_t db) | |||
75 | return ((db) % XFS_DIR2_MAX_FREE_BESTS(mp)); | 75 | return ((db) % XFS_DIR2_MAX_FREE_BESTS(mp)); |
76 | } | 76 | } |
77 | 77 | ||
78 | extern void xfs_dir2_free_log_bests(struct xfs_trans *tp, struct xfs_dabuf *bp, | ||
79 | int first, int last); | ||
80 | extern int xfs_dir2_leaf_to_node(struct xfs_da_args *args, | 78 | extern int xfs_dir2_leaf_to_node(struct xfs_da_args *args, |
81 | struct xfs_dabuf *lbp); | 79 | struct xfs_dabuf *lbp); |
82 | extern xfs_dahash_t xfs_dir2_leafn_lasthash(struct xfs_dabuf *bp, int *count); | 80 | extern xfs_dahash_t xfs_dir2_leafn_lasthash(struct xfs_dabuf *bp, int *count); |
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index d55662db7077..fd02a18facd5 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h | |||
@@ -443,14 +443,9 @@ typedef struct log { | |||
443 | 443 | ||
444 | /* common routines */ | 444 | /* common routines */ |
445 | extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp); | 445 | extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp); |
446 | extern int xlog_find_tail(xlog_t *log, | ||
447 | xfs_daddr_t *head_blk, | ||
448 | xfs_daddr_t *tail_blk); | ||
449 | extern int xlog_recover(xlog_t *log); | 446 | extern int xlog_recover(xlog_t *log); |
450 | extern int xlog_recover_finish(xlog_t *log); | 447 | extern int xlog_recover_finish(xlog_t *log); |
451 | extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int); | 448 | extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int); |
452 | extern struct xfs_buf *xlog_get_bp(xlog_t *, int); | ||
453 | extern void xlog_put_bp(struct xfs_buf *); | ||
454 | 449 | ||
455 | extern kmem_zone_t *xfs_log_ticket_zone; | 450 | extern kmem_zone_t *xfs_log_ticket_zone; |
456 | 451 | ||
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 69ac2e5ef20c..48a7ab1e6311 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
@@ -68,7 +68,7 @@ STATIC void xlog_recover_check_summary(xlog_t *); | |||
68 | ((bbs + (log)->l_sectbb_mask + 1) & ~(log)->l_sectbb_mask) : (bbs) ) | 68 | ((bbs + (log)->l_sectbb_mask + 1) & ~(log)->l_sectbb_mask) : (bbs) ) |
69 | #define XLOG_SECTOR_ROUNDDOWN_BLKNO(log, bno) ((bno) & ~(log)->l_sectbb_mask) | 69 | #define XLOG_SECTOR_ROUNDDOWN_BLKNO(log, bno) ((bno) & ~(log)->l_sectbb_mask) |
70 | 70 | ||
71 | xfs_buf_t * | 71 | STATIC xfs_buf_t * |
72 | xlog_get_bp( | 72 | xlog_get_bp( |
73 | xlog_t *log, | 73 | xlog_t *log, |
74 | int nbblks) | 74 | int nbblks) |
@@ -88,7 +88,7 @@ xlog_get_bp( | |||
88 | return xfs_buf_get_noaddr(BBTOB(nbblks), log->l_mp->m_logdev_targp); | 88 | return xfs_buf_get_noaddr(BBTOB(nbblks), log->l_mp->m_logdev_targp); |
89 | } | 89 | } |
90 | 90 | ||
91 | void | 91 | STATIC void |
92 | xlog_put_bp( | 92 | xlog_put_bp( |
93 | xfs_buf_t *bp) | 93 | xfs_buf_t *bp) |
94 | { | 94 | { |
@@ -805,7 +805,7 @@ xlog_find_head( | |||
805 | * We could speed up search by using current head_blk buffer, but it is not | 805 | * We could speed up search by using current head_blk buffer, but it is not |
806 | * available. | 806 | * available. |
807 | */ | 807 | */ |
808 | int | 808 | STATIC int |
809 | xlog_find_tail( | 809 | xlog_find_tail( |
810 | xlog_t *log, | 810 | xlog_t *log, |
811 | xfs_daddr_t *head_blk, | 811 | xfs_daddr_t *head_blk, |