Merge branch 'f2fs' of git://git.kernel.org/pub/scm/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

diff --cc fs/f2fs/dir.c
Simple merge

diff --cc fs/f2fs/f2fs.h
Simple merge

diff --cc fs/f2fs/node.c
Simple merge

diff --cc fs/f2fs/recovery.c
index 01e1a03b54c856818b5bea63302dbe83c0ba1509,62000422879ae70a5847d915fbd564d6c52055e0..b235215ac13816feea8a960e05f40bb03b9dadf9
--- 1/fs/f2fs/recovery.c
--- 2/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: