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>

diff --git a/fs/xfs/xfs_alloc_btree.c b/fs/xfs/xfs_alloc_btree.c
index 698587f6c60a68f84969acb74b6f70f6bce9c006..13085429e5234783c93e40c3a31492ec7d560428 100644 (file)
--- a/fs/xfs/xfs_alloc_btree.c
+++ b/fs/xfs/xfs_alloc_btree.c
@@ -17,6 +17,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index fdf9992dcbbcb450d805d1beac19281abaa105b9..7b126f46a2f99689cf0bee0efba6c026c0e23186 100644 (file)
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -18,6 +18,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

diff --git a/fs/xfs/xfs_attr_remote.c b/fs/xfs/xfs_attr_remote.c
index 2e5530467f2d3fb28a4a1e871c87994994c6c02f..739e0a52dedadea67eb595f4b03619ce3e3383a3 100644 (file)
--- a/fs/xfs/xfs_attr_remote.c
+++ b/fs/xfs/xfs_attr_remote.c
@@ -18,6 +18,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

diff --git a/fs/xfs/xfs_bit.c b/fs/xfs/xfs_bit.c
index 16ce44a2b43eaac5730be0e3084ed44fd93e86e1..0e8885a596463e9e6d249974d271a234c420057c 100644 (file)
--- a/fs/xfs/xfs_bit.c
+++ b/fs/xfs/xfs_bit.c
@@ -17,6 +17,7 @@
  */
 #include "xfs.h"
 #include "xfs_log_format.h"
+#include "xfs_bit.h"
 
 /*
  * 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 2fb4a2202e1731d153a5250dca593985f0191094..706bc3f777cb390cacd78988b8b8ebe1a63799a6 100644 (file)
--- a/fs/xfs/xfs_bmap_btree.c
+++ b/fs/xfs/xfs_bmap_btree.c
@@ -17,6 +17,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index b6d20c55282b9f20a95eae2d10294863b4dd05cd..a64f67ba25d3c99c748e1d4a8f84f7648e3dd651 100644 (file)
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -809,7 +809,7 @@ xfs_buf_item_init(
  * Mark bytes first through last inclusive as dirty in the buf
  * item's bitmap.
  */
-void
+static void
 xfs_buf_item_log_segment(
        struct xfs_buf_log_item *bip,
        uint                    first,

diff --git a/fs/xfs/xfs_da_format.c b/fs/xfs/xfs_da_format.c
index 870cac0b0981f6ee77313da8b85a05dca7f075bb..e6c83e1fbc8a786bfde2af6aad97e58c8bb19bd7 100644 (file)
--- a/fs/xfs/xfs_da_format.c
+++ b/fs/xfs/xfs_da_format.c
@@ -18,6 +18,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
@@ -706,7 +707,7 @@ xfs_dir3_free_hdr_to_disk(
        hdr3->nused = cpu_to_be32(from->nused);
 }
 
-const struct xfs_dir_ops xfs_dir2_ops = {
+static const struct xfs_dir_ops xfs_dir2_ops = {
        .sf_entsize = xfs_dir2_sf_entsize,
        .sf_nextentry = xfs_dir2_sf_nextentry,
        .sf_get_ftype = xfs_dir2_sfe_get_ftype,
@@ -756,7 +757,7 @@ const struct xfs_dir_ops xfs_dir2_ops = {
        .db_to_fdindex = xfs_dir2_db_to_fdindex,
 };
 
-const struct xfs_dir_ops xfs_dir2_ftype_ops = {
+static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
        .sf_entsize = xfs_dir3_sf_entsize,
        .sf_nextentry = xfs_dir3_sf_nextentry,
        .sf_get_ftype = xfs_dir3_sfe_get_ftype,
@@ -806,7 +807,7 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = {
        .db_to_fdindex = xfs_dir2_db_to_fdindex,
 };
 
-const struct xfs_dir_ops xfs_dir3_ops = {
+static const struct xfs_dir_ops xfs_dir3_ops = {
        .sf_entsize = xfs_dir3_sf_entsize,
        .sf_nextentry = xfs_dir3_sf_nextentry,
        .sf_get_ftype = xfs_dir3_sfe_get_ftype,
@@ -856,14 +857,14 @@ const struct xfs_dir_ops xfs_dir3_ops = {
        .db_to_fdindex = xfs_dir3_db_to_fdindex,
 };
 
-const struct xfs_dir_ops xfs_dir2_nondir_ops = {
+static const struct xfs_dir_ops xfs_dir2_nondir_ops = {
        .node_hdr_size = sizeof(struct xfs_da_node_hdr),
        .node_hdr_to_disk = xfs_da2_node_hdr_to_disk,
        .node_hdr_from_disk = xfs_da2_node_hdr_from_disk,
        .node_tree_p = xfs_da2_node_tree_p,
 };
 
-const struct xfs_dir_ops xfs_dir3_nondir_ops = {
+static const struct xfs_dir_ops xfs_dir3_nondir_ops = {
        .node_hdr_size = sizeof(struct xfs_da3_node_hdr),
        .node_hdr_to_disk = xfs_da3_node_hdr_to_disk,
        .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 aaaf41b298691f50dafed3abca2d038def4e8815..d401457d2f258ac409dfbc4cbfb1af45c6bb07a2 100644 (file)
--- a/fs/xfs/xfs_dquot_buf.c
+++ b/fs/xfs/xfs_dquot_buf.c
@@ -18,6 +18,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
@@ -267,7 +268,7 @@ xfs_dquot_buf_read_verify(
  * the buffer after the update is done. This ensures that the dquot in the
  * buffer always has an up-to-date CRC value.
  */
-void
+static void
 xfs_dquot_buf_write_verify(
        struct xfs_buf  *bp)
 {

diff --git a/fs/xfs/xfs_ialloc_btree.c b/fs/xfs/xfs_ialloc_btree.c
index 1fa142dc86cbd6397dc52e0b7bf9191d12f74eeb..c8fa5bbb36de3163b9fc798fc80025815f46182e 100644 (file)
--- a/fs/xfs/xfs_ialloc_btree.c
+++ b/fs/xfs/xfs_ialloc_btree.c
@@ -17,6 +17,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

diff --git a/fs/xfs/xfs_rtbitmap.c b/fs/xfs/xfs_rtbitmap.c
index e30efe8be5e6066537a3a8a2de03842864b673c7..b1f2fe8af4a8d27db5ca6848711e841073ef092f 100644 (file)
--- a/fs/xfs/xfs_rtbitmap.c
+++ b/fs/xfs/xfs_rtbitmap.c
@@ -37,6 +37,7 @@
 #include "xfs_buf.h"
 #include "xfs_icache.h"
 #include "xfs_dinode.h"
+#include "xfs_rtalloc.h"
 
 
 /*

diff --git a/fs/xfs/xfs_sb.c b/fs/xfs/xfs_sb.c
index 05b5493d2baa0ab44d86e54b84f678a209801020..13c7834b0e6552b88980f455954c1b0b262dc137 100644 (file)
--- a/fs/xfs/xfs_sb.c
+++ b/fs/xfs/xfs_sb.c
@@ -17,6 +17,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 4eb63ad87d7dbe88c59971222a7aa82697231a0d..d971f4932b5d8bb92d5efe645f372462abfbbe81 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1155,7 +1155,7 @@ xfs_restore_resvblks(struct xfs_mount *mp)
  * Note: xfs_log_quiesce() stops background log work - the callers must ensure
  * it is started again when appropriate.
  */
-void
+static void
 xfs_quiesce_attr(
        struct xfs_mount        *mp)
 {