From 9a2d3e93dadff5874ac746749926ad143325bd33 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 2 Dec 2012 08:11:38 -0500
Subject: [PATCH] --- yaml --- r: 347543 b: refs/heads/master c:
 705f814e34e08f6169439014a2916fd5afbdf232 h: refs/heads/master i:   347541:
 c012b4496c5fd60a3ff6d56573debf2f0a816dbb   347539:
 6c34ee006f83c052ded6166efc035eb892659221   347535:
 cf265f8081a9811a72775c38ea4b1bdcb51969ba v: v3

---
 [refs]               | 2 +-
 trunk/fs/f2fs/dir.c  | 2 --
 trunk/fs/f2fs/file.c | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9693408212b7..292d66d04c1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61412b64b965af72798000c3c921e88db31216b1
+refs/heads/master: 705f814e34e08f6169439014a2916fd5afbdf232
diff --git a/trunk/fs/f2fs/dir.c b/trunk/fs/f2fs/dir.c
index 089eb6766890..2a20c504ecd8 100644
--- a/trunk/fs/f2fs/dir.c
+++ b/trunk/fs/f2fs/dir.c
@@ -509,13 +509,11 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
 	}
 
 	if (bit_pos == NR_DENTRY_IN_BLOCK) {
-		loff_t page_offset;
 		truncate_hole(dir, page->index, page->index + 1);
 		clear_page_dirty_for_io(page);
 		ClearPageUptodate(page);
 		dec_page_count(sbi, F2FS_DIRTY_DENTS);
 		inode_dec_dirty_dents(dir);
-		page_offset = page->index << PAGE_CACHE_SHIFT;
 		f2fs_put_page(page, 1);
 	} else {
 		f2fs_put_page(page, 1);
diff --git a/trunk/fs/f2fs/file.c b/trunk/fs/f2fs/file.c
index 89241c50eb96..f9e085dfb1f0 100644
--- a/trunk/fs/f2fs/file.c
+++ b/trunk/fs/f2fs/file.c
@@ -30,7 +30,6 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
 	struct page *page = vmf->page;
 	struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
 	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
-	struct page *node_page;
 	block_t old_blk_addr;
 	struct dnode_of_data dn;
 	int err;
@@ -50,7 +49,6 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
 	}
 
 	old_blk_addr = dn.data_blkaddr;
-	node_page = dn.node_page;
 
 	if (old_blk_addr == NULL_ADDR) {
 		err = reserve_new_block(&dn);