From a8891bf93b36196b0059147b7631bad304e03753 Mon Sep 17 00:00:00 2001
From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date: Thu, 6 Nov 2008 12:53:49 -0800
Subject: [PATCH] --- yaml --- r: 118456 b: refs/heads/master c:
 5e35dd4651002207948f10c576fc7d9bad448815 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/fs/fat/fatent.c | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 66b151a8b454..f2f65893c71f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3dfa8228f87ab9960ab8b4718013d68e3c25a43
+refs/heads/master: 5e35dd4651002207948f10c576fc7d9bad448815
diff --git a/trunk/fs/fat/fatent.c b/trunk/fs/fat/fatent.c
index 5b5f49061b7c..13513992da3c 100644
--- a/trunk/fs/fat/fatent.c
+++ b/trunk/fs/fat/fatent.c
@@ -317,10 +317,20 @@ static inline int fat_ent_update_ptr(struct super_block *sb,
 	/* Is this fatent's blocks including this entry? */
 	if (!fatent->nr_bhs || bhs[0]->b_blocknr != blocknr)
 		return 0;
-	/* Does this entry need the next block? */
-	if (sbi->fat_bits == 12 && (offset + 1) >= sb->s_blocksize) {
-		if (fatent->nr_bhs != 2 || bhs[1]->b_blocknr != (blocknr + 1))
-			return 0;
+	if (sbi->fat_bits == 12) {
+		if ((offset + 1) < sb->s_blocksize) {
+			/* This entry is on bhs[0]. */
+			if (fatent->nr_bhs == 2) {
+				brelse(bhs[1]);
+				fatent->nr_bhs = 1;
+			}
+		} else {
+			/* This entry needs the next block. */
+			if (fatent->nr_bhs != 2)
+				return 0;
+			if (bhs[1]->b_blocknr != (blocknr + 1))
+				return 0;
+		}
 	}
 	ops->ent_set_ptr(fatent, offset);
 	return 1;