Patchwork [1/3] UBIFS: fix false assertion warning in case of I/O failures

login
register
mail settings
Submitter Artem Bityutskiy
Date April 21, 2011, 12:23 p.m.
Message ID <1303388635-28296-1-git-send-email-dedekind1@gmail.com>
Download mbox | patch
Permalink /patch/92405/
State New
Headers show

Comments

Artem Bityutskiy - April 21, 2011, 12:23 p.m.
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

When UBIFS switches to R/O mode because it detects I/O failures, then
when we unmount, we still may have allocated budget, and the assertions
which verify that we have not budget will fire. But it is expected to
have the budget in case of I/O failures, so the assertion warnings will
be false. Suppress them for the I/O failure case.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
 fs/ubifs/super.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

Patch

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 339bdfc..459d8c6 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1773,10 +1773,12 @@  static void ubifs_put_super(struct super_block *sb)
 	 * of the media. For example, there will be dirty inodes if we failed
 	 * to write them back because of I/O errors.
 	 */
-	ubifs_assert(atomic_long_read(&c->dirty_pg_cnt) == 0);
-	ubifs_assert(c->bi.idx_growth == 0);
-	ubifs_assert(c->bi.dd_growth == 0);
-	ubifs_assert(c->bi.data_growth == 0);
+	if (!c->ro_error) {
+		ubifs_assert(atomic_long_read(&c->dirty_pg_cnt) == 0);
+		ubifs_assert(c->bi.idx_growth == 0);
+		ubifs_assert(c->bi.dd_growth == 0);
+		ubifs_assert(c->bi.data_growth == 0);
+	}
 
 	/*
 	 * The 'c->umount_lock' prevents races between UBIFS memory shrinker