From 4db07ab86eab22ee78bc5a6b3178637437aa5a9c Mon Sep 17 00:00:00 2001
From: Yongqiang Yang <xiaoqiangnk@gmail.com>
Date: Tue, 26 Jul 2011 21:39:09 -0400
Subject: [PATCH] --- yaml --- r: 262119 b: refs/heads/master c:
 ce723c31b58f54fb865036805475ee7a8c5dc173 h: refs/heads/master i:   262117:
 3434803242db816e51da749acfed55fd5cdada6c   262115:
 abc7baa980d01b0fc34eb8318911a93ae338b8f7   262111:
 7eeb14af0a8ebd3c0948c89191d5b04f352e82df v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ext4/resize.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 47bf5d0f24b3..cc515e4812ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f82f840ec6ab873f520364d443ff6fa1b3f8e22
+refs/heads/master: ce723c31b58f54fb865036805475ee7a8c5dc173
diff --git a/trunk/fs/ext4/resize.c b/trunk/fs/ext4/resize.c
index 0213f631271f..53d979541b31 100644
--- a/trunk/fs/ext4/resize.c
+++ b/trunk/fs/ext4/resize.c
@@ -23,6 +23,16 @@ int ext4_resize_begin(struct super_block *sb)
 	if (!capable(CAP_SYS_RESOURCE))
 		return -EPERM;
 
+	/*
+	 * We are not allowed to do online-resizing on a filesystem mounted
+	 * with error, because it can destroy the filesystem easily.
+	 */
+	if (EXT4_SB(sb)->s_mount_state & EXT4_ERROR_FS) {
+		ext4_warning(sb, "There are errors in the filesystem, "
+			     "so online resizing is not allowed\n");
+		return -EPERM;
+	}
+
 	if (test_and_set_bit_lock(EXT4_RESIZING, &EXT4_SB(sb)->s_resize_flags))
 		ret = -EBUSY;