From 25cdb4f207a02aae34c3cf01e1301297159c811d Mon Sep 17 00:00:00 2001
From: Joern Engel <joern@logfs.org>
Date: Fri, 5 Aug 2011 11:09:55 +0200
Subject: [PATCH] --- yaml --- r: 287087 b: refs/heads/master c:
 f2933e86ad93a8d1287079d59e67afd6f4166a9d h: refs/heads/master i:   287085:
 0eaf9374512347eb88060440e9cd8733e9c80158   287083:
 1e9faef9be81aaae09982b3be7e8034c91eef1ae   287079:
 47a6664a8d51ccce3f8cb55b0a2ef8e02983466e   287071:
 31187278d92f57affc0358d14c8f6ea2bea6a58a v: v3

---
 [refs]                   |  2 +-
 trunk/fs/logfs/dev_mtd.c | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index ccedb52b3c0d..fe20bfb99eb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbe01387129f76fa4bec17904eb14c4bdc3c179f
+refs/heads/master: f2933e86ad93a8d1287079d59e67afd6f4166a9d
diff --git a/trunk/fs/logfs/dev_mtd.c b/trunk/fs/logfs/dev_mtd.c
index 339e17e9133d..d054d7e975ca 100644
--- a/trunk/fs/logfs/dev_mtd.c
+++ b/trunk/fs/logfs/dev_mtd.c
@@ -150,14 +150,13 @@ static struct page *mtd_find_first_sb(struct super_block *sb, u64 *ofs)
 	filler_t *filler = mtd_readpage;
 	struct mtd_info *mtd = super->s_mtd;
 
-	if (!mtd->block_isbad)
-		return NULL;
-
 	*ofs = 0;
-	while (mtd->block_isbad(mtd, *ofs)) {
-		*ofs += mtd->erasesize;
-		if (*ofs >= mtd->size)
-			return NULL;
+	if (mtd->block_isbad) {
+		while (mtd->block_isbad(mtd, *ofs)) {
+			*ofs += mtd->erasesize;
+			if (*ofs >= mtd->size)
+				return NULL;
+		}
 	}
 	BUG_ON(*ofs & ~PAGE_MASK);
 	return read_cache_page(mapping, *ofs >> PAGE_SHIFT, filler, sb);
@@ -170,14 +169,13 @@ static struct page *mtd_find_last_sb(struct super_block *sb, u64 *ofs)
 	filler_t *filler = mtd_readpage;
 	struct mtd_info *mtd = super->s_mtd;
 
-	if (!mtd->block_isbad)
-		return NULL;
-
 	*ofs = mtd->size - mtd->erasesize;
-	while (mtd->block_isbad(mtd, *ofs)) {
-		*ofs -= mtd->erasesize;
-		if (*ofs <= 0)
-			return NULL;
+	if (mtd->block_isbad) {
+		while (mtd->block_isbad(mtd, *ofs)) {
+			*ofs -= mtd->erasesize;
+			if (*ofs <= 0)
+				return NULL;
+		}
 	}
 	*ofs = *ofs + mtd->erasesize - 0x1000;
 	BUG_ON(*ofs & ~PAGE_MASK);