From: Nathan Scott <nathans@sgi.com>
Date: Fri, 29 Mar 2002 00:00:32 +0000 (+0000)
Subject: sync with kernel, no-op change for userspace.
X-Git-Tag: v2.1.0~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f5ff52f122a957bffb9e02316086463004931cb;p=thirdparty%2Fxfsprogs-dev.git

sync with kernel, no-op change for userspace.
---

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index a58832582..b0fc4293f 100644
--- 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 69f40b722..4d7ed947f 100644
--- 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)