From 99aa9cc19d6f59f0c9a84b021f71cb8861da64ae Mon Sep 17 00:00:00 2001
From: Evgeniy Dushistov <dushistov@mail.ru>
Date: Sun, 25 Jun 2006 05:49:27 -0700
Subject: [PATCH] --- yaml --- r: 29823 b: refs/heads/master c:
 7d93a1a53a72aa704a8fef6e0fb4f6c6cd6aa07a h: refs/heads/master i:   29821:
 7f13d7fee7201c64d989ccec7c89e9c945205800   29819:
 e696d85ea914e1406b43680208312fc156ab981d   29815:
 fb3536c4dfeda404a5a67f4412efd20a97c26f4c   29807:
 b0e00c1e1d3e259afe0f55327b03a4c60c162989   29791:
 554e3bc3ad3c96740ac27f5dd224f2976f0f9bb6   29759:
 606f6106102bb743c282e7f29c2caa46dd84a175   29695:
 149aa9be835531498eef25ba8c84ae31c72b5258 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext2/dir.c   | 3 +--
 trunk/fs/ext2/fsync.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cf571aa046d2..e26efdcb9df1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77787bfb44da6e6166af088226707aeccee27968
+refs/heads/master: 7d93a1a53a72aa704a8fef6e0fb4f6c6cd6aa07a
diff --git a/trunk/fs/ext2/dir.c b/trunk/fs/ext2/dir.c
index 3c1c9aaaca6b..92ea8265d7d5 100644
--- a/trunk/fs/ext2/dir.c
+++ b/trunk/fs/ext2/dir.c
@@ -399,8 +399,7 @@ ino_t ext2_inode_by_name(struct inode * dir, struct dentry *dentry)
 	de = ext2_find_entry (dir, dentry, &page);
 	if (de) {
 		res = le32_to_cpu(de->inode);
-		kunmap(page);
-		page_cache_release(page);
+		ext2_put_page(page);
 	}
 	return res;
 }
diff --git a/trunk/fs/ext2/fsync.c b/trunk/fs/ext2/fsync.c
index c9c2e5ffa48e..7806b9e8155b 100644
--- a/trunk/fs/ext2/fsync.c
+++ b/trunk/fs/ext2/fsync.c
@@ -24,7 +24,7 @@
 
 #include "ext2.h"
 #include <linux/smp_lock.h>
-#include <linux/buffer_head.h>		/* for fsync_inode_buffers() */
+#include <linux/buffer_head.h>		/* for sync_mapping_buffers() */
 
 
 /*