diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-16 11:50:10 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-16 11:50:10 +0200 |
| commit | 3e2bcad89814030ad6a369a97ad1481fd35938d3 (patch) | |
| tree | 8d6b9b163dc9ed44ec377ca5b57be1a1fb80f923 /fs/xfs/xfs_log.c | |
| parent | dcbf77cac640af0ab944d5cbb07934bf6708b4d9 (diff) | |
| parent | b2add73dbf93fd50f00564d7abc3e2b9aa9dd20c (diff) | |
| download | linux-3e2bcad89814030ad6a369a97ad1481fd35938d3.tar.bz2 | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/xfs_log.c')
| -rw-r--r-- | fs/xfs/xfs_log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 3750f04ede0b..9dbdff3ea484 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -3180,7 +3180,7 @@ try_again: STATIC void xlog_state_want_sync(xlog_t *log, xlog_in_core_t *iclog) { - ASSERT(spin_is_locked(&log->l_icloglock)); + assert_spin_locked(&log->l_icloglock); if (iclog->ic_state == XLOG_STATE_ACTIVE) { xlog_state_switch_iclogs(log, iclog, 0); |