sync with kernel, no-op change for userspace.

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index a588325820198339ef0a6c2215d51529907391bd..b0fc4293f5792a0e7895582783f841d3e1f48be2 100644 (file)
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -82,7 +82,7 @@ struct xfs_dio;
 struct xfs_bmbt_irec;
 struct xfs_bmap_free;
 
-#define        SPLDECL(s)              int s
+#define        SPLDECL(s)              unsigned long s
 #define        AIL_LOCK_T              lock_t
 #define        AIL_LOCKINIT(x,y)       spinlock_init(x,y)
 #define        AIL_LOCK_DESTROY(x)     spinlock_destroy(x)

diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index 69f40b7222f43ff9d0d14b3fae3944b1238ac99a..4d7ed947f4dcec88ba538649afbda55514a27828 100644 (file)
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -2337,7 +2337,7 @@ xfs_da_buf_make(int nbuf, xfs_buf_t **bps, inst_t *ra)
        }
 #ifdef XFS_DABUF_DEBUG
        {
-               int             s;
+               SPLDECL(s);
                xfs_dabuf_t     *p;
 
                s = mutex_spinlock(&xfs_dabuf_global_lock);
@@ -2392,7 +2392,7 @@ xfs_da_buf_done(xfs_dabuf_t *dabuf)
                kmem_free(dabuf->data, BBTOB(dabuf->bbcount));
 #ifdef XFS_DABUF_DEBUG
        {
-               int     s;
+               SPLDECL(s);
 
                s = mutex_spinlock(&xfs_dabuf_global_lock);
                if (dabuf->prev)