diff --git a/[refs] b/[refs] index 16c69ac8ba8a..7765c5979d05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71ddabb94a623d1e16e7e66898bf439ff78ecc41 +refs/heads/master: f7b7c3673e6e225de337abe00e14dc048e44782b diff --git a/trunk/fs/xfs/xfs_log.c b/trunk/fs/xfs/xfs_log.c index 301a6b8c2034..7ed15bdc32bf 100644 --- a/trunk/fs/xfs/xfs_log.c +++ b/trunk/fs/xfs/xfs_log.c @@ -764,7 +764,6 @@ xfs_log_move_tail(xfs_mount_t *mp, if (XLOG_FORCED_SHUTDOWN(log)) return; - ASSERT(!XFS_FORCED_SHUTDOWN(mp)); if (tail_lsn == 0) { /* needed since sync_lsn is 64 bits */