diff options
| author | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2013-02-11 23:17:20 +0100 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2013-02-11 23:17:20 +0100 |
| commit | 90b2fc64f0a6d6a6706eae0a90038ed576d5d4b6 (patch) | |
| tree | cc76f9ae4611fee079e85fbff06596815cd1e363 /fs/f2fs/node.c | |
| parent | f2fs: add compat_ioctl to provide backward compatability (diff) | |
| parent | f2fs: get rid of fake on-stack dentries (diff) | |
| download | linux-90b2fc64f0a6d6a6706eae0a90038ed576d5d4b6.tar.xz linux-90b2fc64f0a6d6a6706eae0a90038ed576d5d4b6.zip | |
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
Diffstat (limited to 'fs/f2fs/node.c')
| -rw-r--r-- | fs/f2fs/node.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 43ce16422b75..0da252c78af8 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -780,7 +780,7 @@ int remove_inode_page(struct inode *inode) return 0; } -int new_inode_page(struct inode *inode, struct dentry *dentry) +int new_inode_page(struct inode *inode, const struct qstr *name) { struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); struct page *page; @@ -790,7 +790,7 @@ int new_inode_page(struct inode *inode, struct dentry *dentry) set_new_dnode(&dn, inode, NULL, NULL, inode->i_ino); mutex_lock_op(sbi, NODE_NEW); page = new_node_page(&dn, 0); - init_dent_inode(dentry, page); + init_dent_inode(name, page); mutex_unlock_op(sbi, NODE_NEW); if (IS_ERR(page)) return PTR_ERR(page); |