diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2007-10-11 03:37:31 -0400 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-07 00:44:41 -0500 |
| commit | c8b5ea289fed15a7d7a4d6e911987ff16499aed7 (patch) | |
| tree | 87abfca7086b8d68c1696e9c1557f1d5440e9f32 /fs/xfs/xfs_vnodeops.c | |
| parent | b22cd72c95df0414e0502a0999624d460ba66126 (diff) | |
[XFS] Unwrap GRANT_LOCK.
Un-obfuscate GRANT_LOCK, remove GRANT_LOCK->mutex_lock->spin_lock macros,
call spin_lock directly, remove extraneous cookie holdover from old xfs
code, and change lock type to spinlock_t.
SGI-PV: 970382
SGI-Modid: xfs-linux-melb:xfs-kern:29741a
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Donald Douwsma <donaldd@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index a5cd2dc4c80..7d3c4a7aa2d 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
| @@ -3554,11 +3554,11 @@ xfs_inode_flush( | |||
| 3554 | if (iip && iip->ili_last_lsn) { | 3554 | if (iip && iip->ili_last_lsn) { |
| 3555 | xlog_t *log = mp->m_log; | 3555 | xlog_t *log = mp->m_log; |
| 3556 | xfs_lsn_t sync_lsn; | 3556 | xfs_lsn_t sync_lsn; |
| 3557 | int s, log_flags = XFS_LOG_FORCE; | 3557 | int log_flags = XFS_LOG_FORCE; |
| 3558 | 3558 | ||
| 3559 | s = GRANT_LOCK(log); | 3559 | spin_lock(&log->l_grant_lock); |
| 3560 | sync_lsn = log->l_last_sync_lsn; | 3560 | sync_lsn = log->l_last_sync_lsn; |
| 3561 | GRANT_UNLOCK(log, s); | 3561 | spin_unlock(&log->l_grant_lock); |
| 3562 | 3562 | ||
| 3563 | if ((XFS_LSN_CMP(iip->ili_last_lsn, sync_lsn) > 0)) { | 3563 | if ((XFS_LSN_CMP(iip->ili_last_lsn, sync_lsn) > 0)) { |
| 3564 | if (flags & FLUSH_SYNC) | 3564 | if (flags & FLUSH_SYNC) |