diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 14:21:07 +0100 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 14:21:07 +0100 |
| commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
| tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /fs/xfs/linux-2.6/xfs_sync.c | |
| parent | Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px... (diff) | |
| parent | [ARM] 5414/2: ep93xx m2p dma core (diff) | |
| download | linux-abcea2c322cef559ef2f108b4763d107a5ccc37f.tar.xz linux-abcea2c322cef559ef2f108b4763d107a5ccc37f.zip | |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_sync.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_sync.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c index 2ed035354c26..a608e72fa405 100644 --- a/fs/xfs/linux-2.6/xfs_sync.c +++ b/fs/xfs/linux-2.6/xfs_sync.c @@ -371,7 +371,11 @@ xfs_quiesce_attr( /* flush inodes and push all remaining buffers out to disk */ xfs_quiesce_fs(mp); - ASSERT_ALWAYS(atomic_read(&mp->m_active_trans) == 0); + /* + * Just warn here till VFS can correctly support + * read-only remount without racing. + */ + WARN_ON(atomic_read(&mp->m_active_trans) != 0); /* Push the superblock and write an unmount record */ error = xfs_log_sbcount(mp, 1); |