diff options
author | Dave Chinner <dchinner@redhat.com> | 2013-10-29 07:11:58 -0400 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2013-10-30 14:59:56 -0400 |
commit | 632b89e82bf1c04c251924b49adc689f7b346321 (patch) | |
tree | 4918ee3b34cbe99ffcd5fd982fb1adfcebe5a252 | |
parent | a62936210525da2f46ae264e0bf9680eafac176e (diff) |
xfs: fix static and extern sparse warnings
The kbuild test robot indicated that there were some new sparse
warnings in fs/xfs/xfs_dquot_buf.c. Actually, there were a lot more
that is wasn't warning about, so fix them all up.
Reported-by: kbuild test robot
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
-rw-r--r-- | fs/xfs/xfs_alloc_btree.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_attr_leaf.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_attr_remote.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_bit.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_bmap_btree.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_buf_item.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_da_format.c | 11 | ||||
-rw-r--r-- | fs/xfs/xfs_dquot_buf.c | 3 | ||||
-rw-r--r-- | fs/xfs/xfs_ialloc_btree.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_rtbitmap.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_sb.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_super.c | 2 |
12 files changed, 18 insertions, 8 deletions
diff --git a/fs/xfs/xfs_alloc_btree.c b/fs/xfs/xfs_alloc_btree.c index 698587f6c60a..13085429e523 100644 --- a/fs/xfs/xfs_alloc_btree.c +++ b/fs/xfs/xfs_alloc_btree.c | |||
@@ -17,6 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | #include "xfs.h" | 18 | #include "xfs.h" |
19 | #include "xfs_fs.h" | 19 | #include "xfs_fs.h" |
20 | #include "xfs_shared.h" | ||
20 | #include "xfs_format.h" | 21 | #include "xfs_format.h" |
21 | #include "xfs_log_format.h" | 22 | #include "xfs_log_format.h" |
22 | #include "xfs_trans_resv.h" | 23 | #include "xfs_trans_resv.h" |
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c index fdf9992dcbbc..7b126f46a2f9 100644 --- a/fs/xfs/xfs_attr_leaf.c +++ b/fs/xfs/xfs_attr_leaf.c | |||
@@ -18,6 +18,7 @@ | |||
18 | */ | 18 | */ |
19 | #include "xfs.h" | 19 | #include "xfs.h" |
20 | #include "xfs_fs.h" | 20 | #include "xfs_fs.h" |
21 | #include "xfs_shared.h" | ||
21 | #include "xfs_format.h" | 22 | #include "xfs_format.h" |
22 | #include "xfs_log_format.h" | 23 | #include "xfs_log_format.h" |
23 | #include "xfs_trans_resv.h" | 24 | #include "xfs_trans_resv.h" |
diff --git a/fs/xfs/xfs_attr_remote.c b/fs/xfs/xfs_attr_remote.c index 2e5530467f2d..739e0a52deda 100644 --- a/fs/xfs/xfs_attr_remote.c +++ b/fs/xfs/xfs_attr_remote.c | |||
@@ -18,6 +18,7 @@ | |||
18 | */ | 18 | */ |
19 | #include "xfs.h" | 19 | #include "xfs.h" |
20 | #include "xfs_fs.h" | 20 | #include "xfs_fs.h" |
21 | #include "xfs_shared.h" | ||
21 | #include "xfs_format.h" | 22 | #include "xfs_format.h" |
22 | #include "xfs_log_format.h" | 23 | #include "xfs_log_format.h" |
23 | #include "xfs_trans_resv.h" | 24 | #include "xfs_trans_resv.h" |
diff --git a/fs/xfs/xfs_bit.c b/fs/xfs/xfs_bit.c index 16ce44a2b43e..0e8885a59646 100644 --- a/fs/xfs/xfs_bit.c +++ b/fs/xfs/xfs_bit.c | |||
@@ -17,6 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | #include "xfs.h" | 18 | #include "xfs.h" |
19 | #include "xfs_log_format.h" | 19 | #include "xfs_log_format.h" |
20 | #include "xfs_bit.h" | ||
20 | 21 | ||
21 | /* | 22 | /* |
22 | * XFS bit manipulation routines, used in non-realtime code. | 23 | * XFS bit manipulation routines, used in non-realtime code. |
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c index 2fb4a2202e17..706bc3f777cb 100644 --- a/fs/xfs/xfs_bmap_btree.c +++ b/fs/xfs/xfs_bmap_btree.c | |||
@@ -17,6 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | #include "xfs.h" | 18 | #include "xfs.h" |
19 | #include "xfs_fs.h" | 19 | #include "xfs_fs.h" |
20 | #include "xfs_shared.h" | ||
20 | #include "xfs_format.h" | 21 | #include "xfs_format.h" |
21 | #include "xfs_log_format.h" | 22 | #include "xfs_log_format.h" |
22 | #include "xfs_trans_resv.h" | 23 | #include "xfs_trans_resv.h" |
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index b6d20c55282b..a64f67ba25d3 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c | |||
@@ -809,7 +809,7 @@ xfs_buf_item_init( | |||
809 | * Mark bytes first through last inclusive as dirty in the buf | 809 | * Mark bytes first through last inclusive as dirty in the buf |
810 | * item's bitmap. | 810 | * item's bitmap. |
811 | */ | 811 | */ |
812 | void | 812 | static void |
813 | xfs_buf_item_log_segment( | 813 | xfs_buf_item_log_segment( |
814 | struct xfs_buf_log_item *bip, | 814 | struct xfs_buf_log_item *bip, |
815 | uint first, | 815 | uint first, |
diff --git a/fs/xfs/xfs_da_format.c b/fs/xfs/xfs_da_format.c index 870cac0b0981..e6c83e1fbc8a 100644 --- a/fs/xfs/xfs_da_format.c +++ b/fs/xfs/xfs_da_format.c | |||
@@ -18,6 +18,7 @@ | |||
18 | */ | 18 | */ |
19 | #include "xfs.h" | 19 | #include "xfs.h" |
20 | #include "xfs_fs.h" | 20 | #include "xfs_fs.h" |
21 | #include "xfs_shared.h" | ||
21 | #include "xfs_format.h" | 22 | #include "xfs_format.h" |
22 | #include "xfs_log_format.h" | 23 | #include "xfs_log_format.h" |
23 | #include "xfs_trans_resv.h" | 24 | #include "xfs_trans_resv.h" |
@@ -706,7 +707,7 @@ xfs_dir3_free_hdr_to_disk( | |||
706 | hdr3->nused = cpu_to_be32(from->nused); | 707 | hdr3->nused = cpu_to_be32(from->nused); |
707 | } | 708 | } |
708 | 709 | ||
709 | const struct xfs_dir_ops xfs_dir2_ops = { | 710 | static const struct xfs_dir_ops xfs_dir2_ops = { |
710 | .sf_entsize = xfs_dir2_sf_entsize, | 711 | .sf_entsize = xfs_dir2_sf_entsize, |
711 | .sf_nextentry = xfs_dir2_sf_nextentry, | 712 | .sf_nextentry = xfs_dir2_sf_nextentry, |
712 | .sf_get_ftype = xfs_dir2_sfe_get_ftype, | 713 | .sf_get_ftype = xfs_dir2_sfe_get_ftype, |
@@ -756,7 +757,7 @@ const struct xfs_dir_ops xfs_dir2_ops = { | |||
756 | .db_to_fdindex = xfs_dir2_db_to_fdindex, | 757 | .db_to_fdindex = xfs_dir2_db_to_fdindex, |
757 | }; | 758 | }; |
758 | 759 | ||
759 | const struct xfs_dir_ops xfs_dir2_ftype_ops = { | 760 | static const struct xfs_dir_ops xfs_dir2_ftype_ops = { |
760 | .sf_entsize = xfs_dir3_sf_entsize, | 761 | .sf_entsize = xfs_dir3_sf_entsize, |
761 | .sf_nextentry = xfs_dir3_sf_nextentry, | 762 | .sf_nextentry = xfs_dir3_sf_nextentry, |
762 | .sf_get_ftype = xfs_dir3_sfe_get_ftype, | 763 | .sf_get_ftype = xfs_dir3_sfe_get_ftype, |
@@ -806,7 +807,7 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { | |||
806 | .db_to_fdindex = xfs_dir2_db_to_fdindex, | 807 | .db_to_fdindex = xfs_dir2_db_to_fdindex, |
807 | }; | 808 | }; |
808 | 809 | ||
809 | const struct xfs_dir_ops xfs_dir3_ops = { | 810 | static const struct xfs_dir_ops xfs_dir3_ops = { |
810 | .sf_entsize = xfs_dir3_sf_entsize, | 811 | .sf_entsize = xfs_dir3_sf_entsize, |
811 | .sf_nextentry = xfs_dir3_sf_nextentry, | 812 | .sf_nextentry = xfs_dir3_sf_nextentry, |
812 | .sf_get_ftype = xfs_dir3_sfe_get_ftype, | 813 | .sf_get_ftype = xfs_dir3_sfe_get_ftype, |
@@ -856,14 +857,14 @@ const struct xfs_dir_ops xfs_dir3_ops = { | |||
856 | .db_to_fdindex = xfs_dir3_db_to_fdindex, | 857 | .db_to_fdindex = xfs_dir3_db_to_fdindex, |
857 | }; | 858 | }; |
858 | 859 | ||
859 | const struct xfs_dir_ops xfs_dir2_nondir_ops = { | 860 | static const struct xfs_dir_ops xfs_dir2_nondir_ops = { |
860 | .node_hdr_size = sizeof(struct xfs_da_node_hdr), | 861 | .node_hdr_size = sizeof(struct xfs_da_node_hdr), |
861 | .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, | 862 | .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, |
862 | .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, | 863 | .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, |
863 | .node_tree_p = xfs_da2_node_tree_p, | 864 | .node_tree_p = xfs_da2_node_tree_p, |
864 | }; | 865 | }; |
865 | 866 | ||
866 | const struct xfs_dir_ops xfs_dir3_nondir_ops = { | 867 | static const struct xfs_dir_ops xfs_dir3_nondir_ops = { |
867 | .node_hdr_size = sizeof(struct xfs_da3_node_hdr), | 868 | .node_hdr_size = sizeof(struct xfs_da3_node_hdr), |
868 | .node_hdr_to_disk = xfs_da3_node_hdr_to_disk, | 869 | .node_hdr_to_disk = xfs_da3_node_hdr_to_disk, |
869 | .node_hdr_from_disk = xfs_da3_node_hdr_from_disk, | 870 | .node_hdr_from_disk = xfs_da3_node_hdr_from_disk, |
diff --git a/fs/xfs/xfs_dquot_buf.c b/fs/xfs/xfs_dquot_buf.c index aaaf41b29869..d401457d2f25 100644 --- a/fs/xfs/xfs_dquot_buf.c +++ b/fs/xfs/xfs_dquot_buf.c | |||
@@ -18,6 +18,7 @@ | |||
18 | */ | 18 | */ |
19 | #include "xfs.h" | 19 | #include "xfs.h" |
20 | #include "xfs_fs.h" | 20 | #include "xfs_fs.h" |
21 | #include "xfs_shared.h" | ||
21 | #include "xfs_format.h" | 22 | #include "xfs_format.h" |
22 | #include "xfs_log_format.h" | 23 | #include "xfs_log_format.h" |
23 | #include "xfs_trans_resv.h" | 24 | #include "xfs_trans_resv.h" |
@@ -267,7 +268,7 @@ xfs_dquot_buf_read_verify( | |||
267 | * the buffer after the update is done. This ensures that the dquot in the | 268 | * the buffer after the update is done. This ensures that the dquot in the |
268 | * buffer always has an up-to-date CRC value. | 269 | * buffer always has an up-to-date CRC value. |
269 | */ | 270 | */ |
270 | void | 271 | static void |
271 | xfs_dquot_buf_write_verify( | 272 | xfs_dquot_buf_write_verify( |
272 | struct xfs_buf *bp) | 273 | struct xfs_buf *bp) |
273 | { | 274 | { |
diff --git a/fs/xfs/xfs_ialloc_btree.c b/fs/xfs/xfs_ialloc_btree.c index 1fa142dc86cb..c8fa5bbb36de 100644 --- a/fs/xfs/xfs_ialloc_btree.c +++ b/fs/xfs/xfs_ialloc_btree.c | |||
@@ -17,6 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | #include "xfs.h" | 18 | #include "xfs.h" |
19 | #include "xfs_fs.h" | 19 | #include "xfs_fs.h" |
20 | #include "xfs_shared.h" | ||
20 | #include "xfs_format.h" | 21 | #include "xfs_format.h" |
21 | #include "xfs_log_format.h" | 22 | #include "xfs_log_format.h" |
22 | #include "xfs_trans_resv.h" | 23 | #include "xfs_trans_resv.h" |
diff --git a/fs/xfs/xfs_rtbitmap.c b/fs/xfs/xfs_rtbitmap.c index e30efe8be5e6..b1f2fe8af4a8 100644 --- a/fs/xfs/xfs_rtbitmap.c +++ b/fs/xfs/xfs_rtbitmap.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include "xfs_buf.h" | 37 | #include "xfs_buf.h" |
38 | #include "xfs_icache.h" | 38 | #include "xfs_icache.h" |
39 | #include "xfs_dinode.h" | 39 | #include "xfs_dinode.h" |
40 | #include "xfs_rtalloc.h" | ||
40 | 41 | ||
41 | 42 | ||
42 | /* | 43 | /* |
diff --git a/fs/xfs/xfs_sb.c b/fs/xfs/xfs_sb.c index 05b5493d2baa..13c7834b0e65 100644 --- a/fs/xfs/xfs_sb.c +++ b/fs/xfs/xfs_sb.c | |||
@@ -17,6 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | #include "xfs.h" | 18 | #include "xfs.h" |
19 | #include "xfs_fs.h" | 19 | #include "xfs_fs.h" |
20 | #include "xfs_shared.h" | ||
20 | #include "xfs_format.h" | 21 | #include "xfs_format.h" |
21 | #include "xfs_log_format.h" | 22 | #include "xfs_log_format.h" |
22 | #include "xfs_trans_resv.h" | 23 | #include "xfs_trans_resv.h" |
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 4eb63ad87d7d..d971f4932b5d 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c | |||
@@ -1155,7 +1155,7 @@ xfs_restore_resvblks(struct xfs_mount *mp) | |||
1155 | * Note: xfs_log_quiesce() stops background log work - the callers must ensure | 1155 | * Note: xfs_log_quiesce() stops background log work - the callers must ensure |
1156 | * it is started again when appropriate. | 1156 | * it is started again when appropriate. |
1157 | */ | 1157 | */ |
1158 | void | 1158 | static void |
1159 | xfs_quiesce_attr( | 1159 | xfs_quiesce_attr( |
1160 | struct xfs_mount *mp) | 1160 | struct xfs_mount *mp) |
1161 | { | 1161 | { |