3 files changed, 2 insertions, 20 deletions

diff --git a/fs/xfs/linux-2.6/spin.h b/fs/xfs/linux-2.6/spin.h
index 50a6191178f4..aa23557801b3 100644
--- a/fs/xfs/linux-2.6/spin.h
+++ b/fs/xfs/linux-2.6/spin.h
@@ -21,25 +21,7 @@
 #include <linux/sched.h>        /* preempt needs this */
 #include <linux/spinlock.h>
 
-/*
- * Map lock_t from IRIX to Linux spinlocks.
- *
- * We do not make use of lock_t from interrupt context, so we do not
- * have to worry about disabling interrupts at all (unlike IRIX).
- */
-
-typedef spinlock_t lock_t;
-
-#define SPLDECL(s)                      unsigned long s
-#ifndef DEFINE_SPINLOCK
-#define DEFINE_SPINLOCK(s)              spinlock_t s = SPIN_LOCK_UNLOCKED
-#endif
-
 #define spinlock_init(lock, name)       spin_lock_init(lock)
 #define spinlock_destroy(lock)
-#define mutex_spinlock(lock)            ({ spin_lock(lock); 0; })
-#define mutex_spinunlock(lock, s)       do { spin_unlock(lock); (void)s; } while (0)
-#define nested_spinlock(lock)           spin_lock(lock)
-#define nested_spinunlock(lock)         spin_unlock(lock)
 
 #endif /* __XFS_SUPPORT_SPIN_H__ */
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index f93d2ca654b5..c3e21ef02662 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -181,7 +181,7 @@ typedef struct xfs_icluster {
         xfs_daddr_t             icl_blkno;      /* starting block number of
                                                  * the cluster */
         struct xfs_buf          *icl_buf;       /* the inode buffer */
-        lock_t                  icl_lock;       /* inode list lock */
+        spinlock_t              icl_lock;       /* inode list lock */
 } xfs_icluster_t;
 
 /*
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 31035b76a26f..169d993c0b72 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -236,7 +236,7 @@ typedef struct xfs_mount {
         int                     m_bsize;        /* fs logical block size */
         xfs_agnumber_t          m_agfrotor;     /* last ag where space found */
         xfs_agnumber_t          m_agirotor;     /* last ag dir inode alloced */
-        lock_t                  m_agirotor_lock;/* .. and lock protecting it */
+        spinlock_t              m_agirotor_lock;/* .. and lock protecting it */
         xfs_agnumber_t          m_maxagi;       /* highest inode alloc group */
         struct xfs_inode        *m_inodes;      /* active inode list */
         struct list_head        m_del_inodes;   /* inodes to reclaim */