Commit 36e41eeb authored by Eric Sandeen's avatar Eric Sandeen Committed by Lachlan McIlroy
Browse files

[XFS] Cleanup lock goop.



Switch last couple lock_t's to spinlock_t's. Remove now-unused
spinlock-related macros & types.

SGI-PV: 970382
SGI-Modid: xfs-linux-melb:xfs-kern:29748a

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarDonald Douwsma <donaldd@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 3a0e4870
Loading
Loading
Loading
Loading
+0 −18
Original line number Diff line number Diff line
@@ -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__ */
+1 −1
Original line number Diff line number Diff line
@@ -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;

/*
+1 −1
Original line number Diff line number Diff line
@@ -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 */