mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 16:24:13 +08:00
[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: Eric Sandeen <sandeen@sandeen.net> Signed-off-by: Donald Douwsma <donaldd@sgi.com> Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
parent
3a0e487034
commit
36e41eebda
@ -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__ */
|
||||
|
@ -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;
|
||||
|
||||
/*
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user