f2fs: switch init_inode_metadata() to passing parent and name separately
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 25 Jan 2013 21:08:53 +0000 (16:08 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 8 Feb 2013 07:55:04 +0000 (02:55 -0500)
... sure, it's tempting to just pass dentry.  Except that we don't
_have_ anything resembling a real dentry on one of the paths to it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/f2fs/dir.c

index ca7948a2770d1c872d3add8a85d6642607380cbe..208a804180d6eac0ed8c7e092fea28701e3fd6d9 100644 (file)
@@ -281,13 +281,12 @@ void init_dent_inode(const struct qstr *name, struct page *ipage)
        set_page_dirty(ipage);
 }
 
-static int init_inode_metadata(struct inode *inode, struct dentry *dentry)
+static int init_inode_metadata(struct inode *inode,
+               struct inode *dir, const struct qstr *name)
 {
-       struct inode *dir = dentry->d_parent->d_inode;
-
        if (is_inode_flag_set(F2FS_I(inode), FI_NEW_INODE)) {
                int err;
-               err = new_inode_page(inode, &dentry->d_name);
+               err = new_inode_page(inode, name);
                if (err)
                        return err;
 
@@ -310,7 +309,7 @@ static int init_inode_metadata(struct inode *inode, struct dentry *dentry)
                if (IS_ERR(ipage))
                        return PTR_ERR(ipage);
                set_cold_node(inode, ipage);
-               init_dent_inode(&dentry->d_name, ipage);
+               init_dent_inode(name, ipage);
                f2fs_put_page(ipage, 1);
        }
        if (is_inode_flag_set(F2FS_I(inode), FI_INC_LINK)) {
@@ -433,7 +432,7 @@ start:
        ++level;
        goto start;
 add_dentry:
-       err = init_inode_metadata(inode, dentry);
+       err = init_inode_metadata(inode, dir, &dentry->d_name);
        if (err)
                goto fail;
 
This page took 0.029299 seconds and 5 git commands to generate.