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

Commit 90b2fc64 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

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: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>

Conflicts:
	fs/f2fs/recovery.c
parents e9750824 b7f7a5e0

fs/f2fs/dir.c

+13 −16
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de, 
	mutex_unlock_op(sbi, DENTRY_OPS);

}



void init_dent_inode(struct dentry *dentry, struct page *ipage)

void init_dent_inode(const struct qstr *name, struct page *ipage)

{

	struct f2fs_node *rn;
@@ -274,20 +274,19 @@ void init_dent_inode(struct dentry *dentry, struct page *ipage) 


	wait_on_page_writeback(ipage);



	/* copy dentry info. to this inode page */

	/* copy name info. to this inode page */

	rn = (struct f2fs_node *)page_address(ipage);

	rn->i.i_namelen = cpu_to_le32(dentry->d_name.len);

	memcpy(rn->i.i_name, dentry->d_name.name, dentry->d_name.len);

	rn->i.i_namelen = cpu_to_le32(name->len);

	memcpy(rn->i.i_name, name->name, name->len);

	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);

		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, ipage);

		init_dent_inode(name, ipage);

		f2fs_put_page(ipage, 1);

	}

	if (is_inode_flag_set(F2FS_I(inode), FI_INC_LINK)) {
@@ -371,7 +370,7 @@ static int room_for_filename(struct f2fs_dentry_block *dentry_blk, int slots) 
	goto next;

}



int f2fs_add_link(struct dentry *dentry, struct inode *inode)

int __f2fs_add_link(struct inode *dir, const struct qstr *name, struct inode *inode)

{

	unsigned int bit_pos;

	unsigned int level;
@@ -380,17 +379,15 @@ int f2fs_add_link(struct dentry *dentry, struct inode *inode) 
	f2fs_hash_t dentry_hash;

	struct f2fs_dir_entry *de;

	unsigned int nbucket, nblock;

	struct inode *dir = dentry->d_parent->d_inode;

	struct f2fs_sb_info *sbi = F2FS_SB(dir->i_sb);

	const char *name = dentry->d_name.name;

	size_t namelen = dentry->d_name.len;

	size_t namelen = name->len;

	struct page *dentry_page = NULL;

	struct f2fs_dentry_block *dentry_blk = NULL;

	int slots = GET_DENTRY_SLOTS(namelen);

	int err = 0;

	int i;



	dentry_hash = f2fs_dentry_hash(name, dentry->d_name.len);

	dentry_hash = f2fs_dentry_hash(name->name, name->len);

	level = 0;

	current_depth = F2FS_I(dir)->i_current_depth;

	if (F2FS_I(dir)->chash == dentry_hash) {
@@ -433,7 +430,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, name);

	if (err)

		goto fail;
@@ -442,7 +439,7 @@ int f2fs_add_link(struct dentry *dentry, struct inode *inode) 
	de = &dentry_blk->dentry[bit_pos];

	de->hash_code = dentry_hash;

	de->name_len = cpu_to_le16(namelen);

	memcpy(dentry_blk->filename[bit_pos], name, namelen);

	memcpy(dentry_blk->filename[bit_pos], name->name, name->len);

	de->ino = cpu_to_le32(inode->i_ino);

	set_de_type(de, inode);

	for (i = 0; i < slots; i++)

fs/f2fs/f2fs.h

+9 −3
Original line number Diff line number Diff line
@@ -889,12 +889,18 @@ struct f2fs_dir_entry *f2fs_parent_dir(struct inode *, struct page **); 
ino_t f2fs_inode_by_name(struct inode *, struct qstr *);

void f2fs_set_link(struct inode *, struct f2fs_dir_entry *,

				struct page *, struct inode *);

void init_dent_inode(struct dentry *, struct page *);

int f2fs_add_link(struct dentry *, struct inode *);

void init_dent_inode(const struct qstr *, struct page *);

int __f2fs_add_link(struct inode *, const struct qstr *, struct inode *);

void f2fs_delete_entry(struct f2fs_dir_entry *, struct page *, struct inode *);

int f2fs_make_empty(struct inode *, struct inode *);

bool f2fs_empty_dir(struct inode *);



static inline int f2fs_add_link(struct dentry *dentry, struct inode *inode)

{

	return __f2fs_add_link(dentry->d_parent->d_inode, &dentry->d_name,

				inode);

}



/*

 * super.c

 */
@@ -918,7 +924,7 @@ void get_node_info(struct f2fs_sb_info *, nid_t, struct node_info *); 
int get_dnode_of_data(struct dnode_of_data *, pgoff_t, int);

int truncate_inode_blocks(struct inode *, pgoff_t);

int remove_inode_page(struct inode *);

int new_inode_page(struct inode *, struct dentry *);

int new_inode_page(struct inode *, const struct qstr *);

struct page *new_node_page(struct dnode_of_data *, unsigned int);

void ra_node_page(struct f2fs_sb_info *, nid_t);

struct page *get_node_page(struct f2fs_sb_info *, pgoff_t);

fs/f2fs/node.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

fs/f2fs/recovery.c

+5 −7
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int recover_dentry(struct page *ipage, struct inode *inode) 
{

	struct f2fs_node *raw_node = (struct f2fs_node *)kmap(ipage);

	struct f2fs_inode *raw_inode = &(raw_node->i);

	struct dentry dent, parent;

	struct qstr name;

	struct f2fs_dir_entry *de;

	struct page *page;

	struct inode *dir;
@@ -57,17 +57,15 @@ static int recover_dentry(struct page *ipage, struct inode *inode) 
		goto out;

	}



	parent.d_inode = dir;

	dent.d_parent = &parent;

	dent.d_name.len = le32_to_cpu(raw_inode->i_namelen);

	dent.d_name.name = raw_inode->i_name;

	name.len = le32_to_cpu(raw_inode->i_namelen);

	name.name = raw_inode->i_name;



	de = f2fs_find_entry(dir, &dent.d_name, &page);

	de = f2fs_find_entry(dir, &name, &page);

	if (de) {

		kunmap(page);

		f2fs_put_page(page, 0);

	} else {

		err = f2fs_add_link(&dent, inode);

		err = __f2fs_add_link(dir, &name, inode);

	}

	iput(dir);

out: