]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[XFS] Fix up sparse warnings.
authorDavid Chinner <dgc@sgi.com>
Fri, 23 Nov 2007 05:28:09 +0000 (16:28 +1100)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Thu, 7 Feb 2008 07:14:38 +0000 (18:14 +1100)
These are mostly locking annotations, marking things static, casts where
needed and declaring stuff in header files.

SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:30002a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
19 files changed:
fs/xfs/linux-2.6/xfs_globals.c
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/linux-2.6/xfs_ioctl32.c
fs/xfs/xfs_attr.c
fs/xfs/xfs_bmap.c
fs/xfs/xfs_bmap.h
fs/xfs/xfs_btree.h
fs/xfs/xfs_buf_item.h
fs/xfs/xfs_da_btree.h
fs/xfs/xfs_dir2.c
fs/xfs/xfs_filestream.c
fs/xfs/xfs_log.c
fs/xfs/xfs_log_recover.c
fs/xfs/xfs_mount.c
fs/xfs/xfs_mru_cache.c
fs/xfs/xfs_rename.c
fs/xfs/xfs_trans.h
fs/xfs/xfs_trans_item.c
fs/xfs/xfs_vfsops.c

index 9febf9dc999d902558c527fbc0a01c77c0f46602..ef90e64641e6a662b0478d74fc0918246c9a2e95 100644 (file)
@@ -47,5 +47,6 @@ xfs_param_t xfs_params = {
 /*
  * Global system credential structure.
  */
-cred_t sys_cred_val, *sys_cred = &sys_cred_val;
+static cred_t sys_cred_val;
+cred_t *sys_cred = &sys_cred_val;
 
index cb2c99126288c6b39de65779211f70b9e355470c..daa351a0a03d5edd33adcd9542879d01fb76b89a 100644 (file)
@@ -512,7 +512,7 @@ xfs_attrmulti_attr_get(
        if (!kbuf)
                return ENOMEM;
 
-       error = xfs_attr_get(XFS_I(inode), name, kbuf, len, flags, NULL);
+       error = xfs_attr_get(XFS_I(inode), name, kbuf, (int *)len, flags, NULL);
        if (error)
                goto out_kfree;
 
index 83463c27545ce6958cd59d2b5069cdc5d43738d5..a4b254eb43b2ec74151ada8ffb1e9fc2dd41cfab 100644 (file)
@@ -44,6 +44,7 @@
 #include "xfs_error.h"
 #include "xfs_dfrag.h"
 #include "xfs_vnodeops.h"
+#include "xfs_ioctl32.h"
 
 #define  _NATIVE_IOC(cmd, type) \
          _IOC(_IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), sizeof(type))
index 93fa64dd1be6ab49287bc5a1e8a4659767fa20f0..e58f321fdae9b1822038c58605785d277a3e6fb2 100644 (file)
@@ -929,7 +929,7 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
  * This leaf block cannot have a "remote" value, we only call this routine
  * if bmap_one_block() says there is only one block (ie: no remote blks).
  */
-int
+STATIC int
 xfs_attr_leaf_addname(xfs_da_args_t *args)
 {
        xfs_inode_t *dp;
index 97f0328b5ac252ec3926fb9978d72ad6e3696b8e..b02452b1145687884c8a48510bb56d09b56b8342 100644 (file)
@@ -6393,7 +6393,7 @@ xfs_bmap_count_blocks(
  * Recursively walks each level of a btree
  * to count total fsblocks is use.
  */
-int                                     /* error */
+STATIC int                                     /* error */
 xfs_bmap_count_tree(
        xfs_mount_t     *mp,            /* file system mount point */
        xfs_trans_t     *tp,            /* transaction pointer */
@@ -6469,7 +6469,7 @@ xfs_bmap_count_tree(
 /*
  * Count leaf blocks given a range of extent records.
  */
-int
+STATIC int
 xfs_bmap_count_leaves(
        xfs_ifork_t             *ifp,
        xfs_extnum_t            idx,
@@ -6489,7 +6489,7 @@ xfs_bmap_count_leaves(
  * Count leaf blocks given a range of extent records originally
  * in btree format.
  */
-int
+STATIC int
 xfs_bmap_disk_count_leaves(
        xfs_extnum_t            idx,
        xfs_bmbt_block_t        *block,
index 68267d75ff19ef4264c5d316c0084149c53b54a6..87224b7d7984d9affdc9323f71d3c4066ed3f0a3 100644 (file)
@@ -25,6 +25,8 @@ struct xfs_inode;
 struct xfs_mount;
 struct xfs_trans;
 
+extern kmem_zone_t     *xfs_bmap_free_item_zone;
+
 /*
  * DELTA: describe a change to the in-core extent list.
  *
index 6e40a0a198ffd19a1da3750e6d1cd6746e8414ef..7440b78f9cec3b6d5c722e804b3fbc5acca756c8 100644 (file)
@@ -24,6 +24,8 @@ struct xfs_inode;
 struct xfs_mount;
 struct xfs_trans;
 
+extern kmem_zone_t     *xfs_btree_cur_zone;
+
 /*
  * This nonsense is to make -wlint happy.
  */
index d7e13614306635bfae1f31bfbd1728e0ff3c1e36..5a41c348bb1ce7f6b2d7e55a7d096ae17ebc4ba8 100644 (file)
@@ -18,6 +18,8 @@
 #ifndef        __XFS_BUF_ITEM_H__
 #define        __XFS_BUF_ITEM_H__
 
+extern kmem_zone_t     *xfs_buf_item_zone;
+
 /*
  * This is the structure used to lay out a buf log item in the
  * log.  The data map describes which 128 byte chunks of the buffer
index 44dabf02f2a3ca99c844101fa213a000949fed0f..7facf86f74f92c6904fcfc5da89435ecc5f8a3db 100644 (file)
@@ -260,6 +260,7 @@ void xfs_da_binval(struct xfs_trans *tp, xfs_dabuf_t *dabuf);
 xfs_daddr_t xfs_da_blkno(xfs_dabuf_t *dabuf);
 
 extern struct kmem_zone *xfs_da_state_zone;
+extern struct kmem_zone *xfs_dabuf_zone;
 #endif /* __KERNEL__ */
 
 #endif /* __XFS_DA_BTREE_H__ */
index 1e22133178d36a7518d845cdb16447258d35cd5b..be7c4251fa619e03a161cf3d66c60dd2e0518151 100644 (file)
@@ -42,6 +42,7 @@
 #include "xfs_dir2_node.h"
 #include "xfs_dir2_trace.h"
 #include "xfs_error.h"
+#include "xfs_vnodeops.h"
 
 
 void
index 36d8f6aa11afeed014b3223c1a00334a502c9e38..eb03eab5ca52bd5f924e986a516ef800c5bb8e3a 100644 (file)
@@ -348,7 +348,7 @@ _xfs_filestream_update_ag(
 }
 
 /* xfs_fstrm_free_func(): callback for freeing cached stream items. */
-void
+STATIC void
 xfs_fstrm_free_func(
        unsigned long   ino,
        void            *data)
index 6e3d8084d8b31ebbd41f4458845c3b4a286a2cfd..301a6b8c2034589a9c3a67dd81fc14042bbdff97 100644 (file)
@@ -907,7 +907,7 @@ xlog_assign_tail_lsn(xfs_mount_t *mp)
  * the tail.  The details of this case are described below, but the end
  * result is that we return the size of the log as the amount of space left.
  */
-int
+STATIC int
 xlog_space_left(xlog_t *log, int cycle, int bytes)
 {
        int free_bytes;
@@ -1289,7 +1289,7 @@ xlog_commit_record(xfs_mount_t  *mp,
  * pushes on an lsn which is further along in the log once we reach the high
  * water mark.  In this manner, we would be creating a low water mark.
  */
-void
+STATIC void
 xlog_grant_push_ail(xfs_mount_t        *mp,
                    int         need_bytes)
 {
@@ -1372,7 +1372,7 @@ xlog_grant_push_ail(xfs_mount_t   *mp,
  * is added immediately before calling bwrite().
  */
 
-int
+STATIC int
 xlog_sync(xlog_t               *log,
          xlog_in_core_t        *iclog)
 {
@@ -1516,7 +1516,7 @@ xlog_sync(xlog_t          *log,
 /*
  * Deallocate a log structure
  */
-void
+STATIC void
 xlog_dealloc_log(xlog_t *log)
 {
        xlog_in_core_t  *iclog, *next_iclog;
@@ -1738,7 +1738,7 @@ xlog_print_tic_res(xfs_mount_t *mp, xlog_ticket_t *ticket)
  *     we don't update ic_offset until the end when we know exactly how many
  *     bytes have been written out.
  */
-int
+STATIC int
 xlog_write(xfs_mount_t *       mp,
           xfs_log_iovec_t      reg[],
           int                  nentries,
@@ -2280,7 +2280,7 @@ xlog_state_do_callback(
  * global state machine log lock.  Assume that the calls to cvsema won't
  * take a long time.  At least we know it won't sleep.
  */
-void
+STATIC void
 xlog_state_done_syncing(
        xlog_in_core_t  *iclog,
        int             aborted)
@@ -2340,7 +2340,7 @@ xlog_state_done_syncing(
  *             needs to be incremented, depending on the amount of data which
  *             is copied.
  */
-int
+STATIC int
 xlog_state_get_iclog_space(xlog_t        *log,
                           int            len,
                           xlog_in_core_t **iclogp,
@@ -2776,7 +2776,7 @@ xlog_ungrant_log_space(xlog_t          *log,
 /*
  * Atomically put back used ticket.
  */
-void
+STATIC void
 xlog_state_put_ticket(xlog_t       *log,
                      xlog_ticket_t *tic)
 {
@@ -2794,7 +2794,7 @@ xlog_state_put_ticket(xlog_t          *log,
  *
  *
  */
-int
+STATIC int
 xlog_state_release_iclog(xlog_t                *log,
                         xlog_in_core_t *iclog)
 {
@@ -3024,7 +3024,7 @@ no_sleep:
  * If filesystem activity goes to zero, the iclog will get flushed only by
  * bdflush().
  */
-int
+STATIC int
 xlog_state_sync(xlog_t   *log,
                xfs_lsn_t lsn,
                uint      flags,
@@ -3129,7 +3129,7 @@ try_again:
  * Called when we want to mark the current iclog as being ready to sync to
  * disk.
  */
-void
+STATIC void
 xlog_state_want_sync(xlog_t *log, xlog_in_core_t *iclog)
 {
        spin_lock(&log->l_icloglock);
@@ -3241,7 +3241,7 @@ xlog_ticket_put(xlog_t            *log,
 /*
  * Grab ticket off freelist or allocation some more
  */
-xlog_ticket_t *
+STATIC xlog_ticket_t *
 xlog_ticket_get(xlog_t         *log,
                int             unit_bytes,
                int             cnt,
index 35e098d4d749f31947dedeeeaaa7d1fec2124130..3b804b93b28205aaa2910dfb5b3198f9bbf03603 100644 (file)
@@ -293,7 +293,7 @@ xlog_recover_iodone(
  * Note that the algorithm can not be perfect because the disk will not
  * necessarily be perfect.
  */
-int
+STATIC int
 xlog_find_cycle_start(
        xlog_t          *log,
        xfs_buf_t       *bp,
@@ -986,7 +986,7 @@ exit:
  *     -1 => use *blk_no as the first block of the log
  *     >0 => error has occurred
  */
-int
+STATIC int
 xlog_find_zeroed(
        xlog_t          *log,
        xfs_daddr_t     *blk_no)
index 2806d43d7d233b4e8032a428924c1de392f96249..766c01670b2ce15b74e71eece63c81df4ffe5c68 100644 (file)
@@ -2343,7 +2343,7 @@ out:
                spin_unlock(&mp->m_sb_lock);
 }
 
-int
+STATIC int
 xfs_icsb_modify_counters(
        xfs_mount_t     *mp,
        xfs_sb_field_t  field,
index 012209eda35d847a61b1f13b7c7caa579455956d..a0b2c0a2589a97166f23982999aa3a15b95a9687 100644 (file)
@@ -225,10 +225,14 @@ _xfs_mru_cache_list_insert(
  * list need to be deleted.  For each element this involves removing it from the
  * data store, removing it from the reap list, calling the client's free
  * function and deleting the element from the element zone.
+ *
+ * We get called holding the mru->lock, which we drop and then reacquire.
+ * Sparse need special help with this to tell it we know what we are doing.
  */
 STATIC void
 _xfs_mru_cache_clear_reap_list(
-       xfs_mru_cache_t         *mru)
+       xfs_mru_cache_t         *mru) __releases(mru->lock) __acquires(mru->lock)
+
 {
        xfs_mru_cache_elem_t    *elem, *next;
        struct list_head        tmp;
@@ -528,6 +532,10 @@ xfs_mru_cache_delete(
  *
  * If the element isn't found, this function returns NULL and the spinlock is
  * released.  xfs_mru_cache_done() should NOT be called when this occurs.
+ *
+ * Because sparse isn't smart enough to know about conditional lock return
+ * status, we need to help it get it right by annotating the path that does
+ * not release the lock.
  */
 void *
 xfs_mru_cache_lookup(
@@ -545,8 +553,8 @@ xfs_mru_cache_lookup(
        if (elem) {
                list_del(&elem->list_node);
                _xfs_mru_cache_list_insert(mru, elem);
-       }
-       else
+               __release(mru_lock); /* help sparse not be stupid */
+       else
                spin_unlock(&mru->lock);
 
        return elem ? elem->value : NULL;
@@ -575,6 +583,8 @@ xfs_mru_cache_peek(
        elem = radix_tree_lookup(&mru->store, key);
        if (!elem)
                spin_unlock(&mru->lock);
+       else
+               __release(mru_lock); /* help sparse not be stupid */
 
        return elem ? elem->value : NULL;
 }
@@ -586,7 +596,7 @@ xfs_mru_cache_peek(
  */
 void
 xfs_mru_cache_done(
-       xfs_mru_cache_t *mru)
+       xfs_mru_cache_t *mru) __releases(mru->lock)
 {
        spin_unlock(&mru->lock);
 }
index 17e7496bdd5f58786d2d273d49aebd1c49a3f369..7eb157a59f9eef5521babb49a5d8e082dc9f68d2 100644 (file)
@@ -39,6 +39,7 @@
 #include "xfs_refcache.h"
 #include "xfs_utils.h"
 #include "xfs_trans_space.h"
+#include "xfs_vnodeops.h"
 
 
 /*
index 0e26e729023eaf919720a9a7b48b6cb4aaf7240e..bea6e2b95a903d69011f014101c12a94d8c056ed 100644 (file)
@@ -1001,6 +1001,8 @@ xfs_log_busy_slot_t *xfs_trans_add_busy(xfs_trans_t *tp,
                                        xfs_agnumber_t ag,
                                        xfs_extlen_t idx);
 
+extern kmem_zone_t     *xfs_trans_zone;
+
 #endif /* __KERNEL__ */
 
 #endif /* __XFS_TRANS_H__ */
index 2912aac07c7bff8d7133a54297c78d6707a6669c..66a09f0d894b0c42b2eafb5a667bf1e0c57b4b97 100644 (file)
@@ -21,6 +21,7 @@
 #include "xfs_log.h"
 #include "xfs_inum.h"
 #include "xfs_trans.h"
+#include "xfs_trans_priv.h"
 
 STATIC int     xfs_trans_unlock_chunk(xfs_log_item_chunk_t *,
                                        int, int, xfs_lsn_t);
index fd4a0dfc599fae0b5c497e1e63ee69e9a5a8d7d0..871a1747706b0a80ea39d6991f1adf800000bfb8 100644 (file)
 int
 xfs_init(void)
 {
-       extern kmem_zone_t      *xfs_bmap_free_item_zone;
-       extern kmem_zone_t      *xfs_btree_cur_zone;
-       extern kmem_zone_t      *xfs_trans_zone;
-       extern kmem_zone_t      *xfs_buf_item_zone;
-       extern kmem_zone_t      *xfs_dabuf_zone;
 #ifdef XFS_DABUF_DEBUG
        extern spinlock_t        xfs_dabuf_global_lock;
        spin_lock_init(&xfs_dabuf_global_lock);
@@ -155,15 +150,9 @@ xfs_init(void)
 void
 xfs_cleanup(void)
 {
-       extern kmem_zone_t      *xfs_bmap_free_item_zone;
-       extern kmem_zone_t      *xfs_btree_cur_zone;
        extern kmem_zone_t      *xfs_inode_zone;
-       extern kmem_zone_t      *xfs_trans_zone;
-       extern kmem_zone_t      *xfs_da_state_zone;
-       extern kmem_zone_t      *xfs_dabuf_zone;
        extern kmem_zone_t      *xfs_efd_zone;
        extern kmem_zone_t      *xfs_efi_zone;
-       extern kmem_zone_t      *xfs_buf_item_zone;
        extern kmem_zone_t      *xfs_icluster_zone;
 
        xfs_cleanup_procfs();