Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69f24eac authored by Al Viro's avatar Al Viro
Browse files

f2fs: switch init_inode_metadata() to passing parent and name separately 



... 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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c004363d

fs/f2fs/dir.c

+5 −6
Original line number Diff line number Diff line
@@ -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 @@ int f2fs_add_link(struct dentry *dentry, struct inode *inode) 
	++level;

	goto start;

add_dentry:

	err = init_inode_metadata(inode, dentry);

	err = init_inode_metadata(inode, dir, &dentry->d_name);

	if (err)

		goto fail;