From: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Date: Mon, 11 Feb 2013 22:17:20 +0000 (+0900)
Subject: Merge branch 'f2fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into dev
X-Git-Tag: upstream/snapshot3+hdmi~5636^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90b2fc64f0a6d6a6706eae0a90038ed576d5d4b6;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'f2fs' of git://git./linux/kernel/git/viro/vfs into dev

Pull f2fs cleanup patches from Al Viro:

f2fs: get rid of fake on-stack dentries
f2fs: switch init_inode_metadata() to passing parent and name separately
f2fs: switch new_inode_page() from dentry to qstr
f2fs: init_dent_inode() should take qstr

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>

Conflicts:
	fs/f2fs/recovery.c
---

90b2fc64f0a6d6a6706eae0a90038ed576d5d4b6
diff --cc fs/f2fs/recovery.c
index 01e1a03,6200042..b235215
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@@ -67,7 -65,7 +65,7 @@@ static int recover_dentry(struct page *
  		kunmap(page);
  		f2fs_put_page(page, 0);
  	} else {
- 		err = f2fs_add_link(&dent, inode);
 -		__f2fs_add_link(dir, &name, inode);
++		err = __f2fs_add_link(dir, &name, inode);
  	}
  	iput(dir);
  out: