From 7fe693de215675e685c12597afbb0c37ffb27955 Mon Sep 17 00:00:00 2001
From: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Date: Tue, 5 May 2009 21:52:06 +0900
Subject: [PATCH] --- yaml --- r: 144901 b: refs/heads/master c:
 843382370ec614768ac13582405f93635cf3637c h: refs/heads/master i:   144899:
 02d6d1320aee124b4fd62847a8660a1b22c066c5 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nilfs2/mdt.c  | 2 +-
 trunk/fs/nilfs2/page.c | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a1b9546381fb..0ea9951a8aa2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 201913ed746c7724a40d33ee5a0b6a1fd2ef3193
+refs/heads/master: 843382370ec614768ac13582405f93635cf3637c
diff --git a/trunk/fs/nilfs2/mdt.c b/trunk/fs/nilfs2/mdt.c
index e1c6777931b7..bb78745a0e30 100644
--- a/trunk/fs/nilfs2/mdt.c
+++ b/trunk/fs/nilfs2/mdt.c
@@ -300,7 +300,7 @@ int nilfs_mdt_delete_block(struct inode *inode, unsigned long block)
 	int err;
 
 	err = nilfs_bmap_delete(ii->i_bmap, block);
-	if (likely(!err)) {
+	if (!err || err == -ENOENT) {
 		nilfs_mdt_mark_dirty(inode);
 		nilfs_mdt_forget_block(inode, block);
 	}
diff --git a/trunk/fs/nilfs2/page.c b/trunk/fs/nilfs2/page.c
index 1bfbba9c0e9a..a2692bbc7b50 100644
--- a/trunk/fs/nilfs2/page.c
+++ b/trunk/fs/nilfs2/page.c
@@ -128,7 +128,8 @@ void nilfs_forget_buffer(struct buffer_head *bh)
 
 	lock_buffer(bh);
 	clear_buffer_nilfs_volatile(bh);
-	if (test_clear_buffer_dirty(bh) && nilfs_page_buffers_clean(page))
+	clear_buffer_dirty(bh);
+	if (nilfs_page_buffers_clean(page))
 		__nilfs_clear_page_dirty(page);
 
 	clear_buffer_uptodate(bh);