summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-01-22 21:34:05 -0600
committerFelix Blyakher <felixb@sgi.com>2009-02-03 11:04:54 -0600
commit43f3f057c56d030546145696627f13f95735be95 (patch)
tree80124e5096315934cf90af96d5b6d71428ed1b89
parent6139a2360987f55e4490a7813cf69df74ec8b93a (diff)
downloadop-kernel-dev-43f3f057c56d030546145696627f13f95735be95.zip
op-kernel-dev-43f3f057c56d030546145696627f13f95735be95.tar.gz
[XFS] Warn on transaction in flight on read-only remount
Till VFS can correctly support read-only remount without racing, use WARN_ON instead of BUG_ON on detecting transaction in flight after quiescing filesystem. Signed-off-by: Felix Blyakher <felixb@sgi.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
-rw-r--r--fs/xfs/linux-2.6/xfs_sync.c6
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 2ed0353..a608e72 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);
OpenPOWER on IntegriCloud