f2fs: enable inline dir handling (622f28ae) · Commits · jan.koester / Linux

fs/f2fs/dir.c

+30 −2

Original line number	Original line	Diff line number	Diff line
	@@ -201,6 +201,9 @@ struct f2fs_dir_entry f2fs_find_entry(struct inode dir,
	unsigned int max_depth;		unsigned int max_depth;
	unsigned int level;		unsigned int level;

			if (f2fs_has_inline_dentry(dir))
			return find_in_inline_dir(dir, child, res_page);

	if (npages == 0)		if (npages == 0)
	return NULL;		return NULL;

	@@ -227,6 +230,9 @@ struct f2fs_dir_entry f2fs_parent_dir(struct inode dir, struct page **p)
	struct f2fs_dir_entry *de;		struct f2fs_dir_entry *de;
	struct f2fs_dentry_block *dentry_blk;		struct f2fs_dentry_block *dentry_blk;

			if (f2fs_has_inline_dentry(dir))
			return f2fs_parent_inline_dir(dir, p);

	page = get_lock_data_page(dir, 0);		page = get_lock_data_page(dir, 0);
	if (IS_ERR(page))		if (IS_ERR(page))
	return NULL;		return NULL;
	@@ -247,6 +253,7 @@ ino_t f2fs_inode_by_name(struct inode dir, struct qstr qstr)
	de = f2fs_find_entry(dir, qstr, &page);		de = f2fs_find_entry(dir, qstr, &page);
	if (de) {		if (de) {
	res = le32_to_cpu(de->ino);		res = le32_to_cpu(de->ino);
			if (!f2fs_has_inline_dentry(dir))
	kunmap(page);		kunmap(page);
	f2fs_put_page(page, 0);		f2fs_put_page(page, 0);
	}		}
	@@ -261,6 +268,7 @@ void f2fs_set_link(struct inode dir, struct f2fs_dir_entry de,
	f2fs_wait_on_page_writeback(page, DATA);		f2fs_wait_on_page_writeback(page, DATA);
	de->ino = cpu_to_le32(inode->i_ino);		de->ino = cpu_to_le32(inode->i_ino);
	set_de_type(de, inode);		set_de_type(de, inode);
			if (!f2fs_has_inline_dentry(dir))
	kunmap(page);		kunmap(page);
	set_page_dirty(page);		set_page_dirty(page);
	dir->i_mtime = dir->i_ctime = CURRENT_TIME;		dir->i_mtime = dir->i_ctime = CURRENT_TIME;
	@@ -303,6 +311,9 @@ static int make_empty_dir(struct inode *inode,
	struct f2fs_dentry_block *dentry_blk;		struct f2fs_dentry_block *dentry_blk;
	struct f2fs_dir_entry *de;		struct f2fs_dir_entry *de;

			if (f2fs_has_inline_dentry(inode))
			return make_empty_inline_dir(inode, parent, page);

	dentry_page = get_new_data_page(inode, page, 0, true);		dentry_page = get_new_data_page(inode, page, 0, true);
	if (IS_ERR(dentry_page))		if (IS_ERR(dentry_page))
	return PTR_ERR(dentry_page);		return PTR_ERR(dentry_page);
	@@ -462,6 +473,14 @@ int __f2fs_add_link(struct inode dir, const struct qstr name,
	int err = 0;		int err = 0;
	int i;		int i;

			if (f2fs_has_inline_dentry(dir)) {
			err = f2fs_add_inline_entry(dir, name, inode);
			if (!err \|\| err != -EAGAIN)
			return err;
			else
			err = 0;
			}

	dentry_hash = f2fs_dentry_hash(name);		dentry_hash = f2fs_dentry_hash(name);
	level = 0;		level = 0;
	current_depth = F2FS_I(dir)->i_current_depth;		current_depth = F2FS_I(dir)->i_current_depth;
	@@ -600,6 +619,9 @@ void f2fs_delete_entry(struct f2fs_dir_entry dentry, struct page page,
	int slots = GET_DENTRY_SLOTS(le16_to_cpu(dentry->name_len));		int slots = GET_DENTRY_SLOTS(le16_to_cpu(dentry->name_len));
	int i;		int i;

			if (f2fs_has_inline_dentry(dir))
			return f2fs_delete_inline_entry(dentry, page, dir, inode);

	lock_page(page);		lock_page(page);
	f2fs_wait_on_page_writeback(page, DATA);		f2fs_wait_on_page_writeback(page, DATA);

	@@ -637,6 +659,9 @@ bool f2fs_empty_dir(struct inode *dir)
	struct f2fs_dentry_block *dentry_blk;		struct f2fs_dentry_block *dentry_blk;
	unsigned long nblock = dir_blocks(dir);		unsigned long nblock = dir_blocks(dir);

			if (f2fs_has_inline_dentry(dir))
			return f2fs_empty_inline_dir(dir);

	for (bidx = 0; bidx < nblock; bidx++) {		for (bidx = 0; bidx < nblock; bidx++) {
	dentry_page = get_lock_data_page(dir, bidx);		dentry_page = get_lock_data_page(dir, bidx);
	if (IS_ERR(dentry_page)) {		if (IS_ERR(dentry_page)) {
	@@ -676,6 +701,9 @@ static int f2fs_readdir(struct file file, struct dir_context ctx)
	unsigned int n = ((unsigned long)ctx->pos / NR_DENTRY_IN_BLOCK);		unsigned int n = ((unsigned long)ctx->pos / NR_DENTRY_IN_BLOCK);
	unsigned char d_type = DT_UNKNOWN;		unsigned char d_type = DT_UNKNOWN;

			if (f2fs_has_inline_dentry(inode))
			return f2fs_read_inline_dir(file, ctx);

	bit_pos = ((unsigned long)ctx->pos % NR_DENTRY_IN_BLOCK);		bit_pos = ((unsigned long)ctx->pos % NR_DENTRY_IN_BLOCK);

	/* readahead for multi pages of dir */		/* readahead for multi pages of dir */

fs/f2fs/file.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -314,7 +314,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence)
	goto fail;		goto fail;

	/* handle inline data case */		/* handle inline data case */
	if (f2fs_has_inline_data(inode)) {		if (f2fs_has_inline_data(inode) \|\| f2fs_has_inline_dentry(inode)) {
	if (whence == SEEK_HOLE)		if (whence == SEEK_HOLE)
	data_ofs = isize;		data_ofs = isize;
	goto found;		goto found;

fs/f2fs/inline.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -424,7 +424,7 @@ int f2fs_convert_inline_dir(struct inode dir, struct page ipage,
	/* clear inline dir and flag after data writeback */		/* clear inline dir and flag after data writeback */
	zero_user_segment(ipage, INLINE_DATA_OFFSET,		zero_user_segment(ipage, INLINE_DATA_OFFSET,
	INLINE_DATA_OFFSET + MAX_INLINE_DATA);		INLINE_DATA_OFFSET + MAX_INLINE_DATA);
			clear_inode_flag(F2FS_I(dir), FI_INLINE_DENTRY);
	stat_dec_inline_inode(dir);		stat_dec_inline_inode(dir);

	if (i_size_read(dir) < PAGE_CACHE_SIZE) {		if (i_size_read(dir) < PAGE_CACHE_SIZE) {

fs/f2fs/namei.c

+24 −10

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,10 @@ static struct inode f2fs_new_inode(struct inode dir, umode_t mode)
	nid_free = true;		nid_free = true;
	goto out;		goto out;
	}		}

			if (test_opt(sbi, INLINE_DENTRY) && S_ISDIR(inode->i_mode))
			set_inode_flag(F2FS_I(inode), FI_INLINE_DENTRY);

	trace_f2fs_new_inode(inode, 0);		trace_f2fs_new_inode(inode, 0);
	mark_inode_dirty(inode);		mark_inode_dirty(inode);
	return inode;		return inode;
	@@ -187,6 +191,7 @@ static struct dentry f2fs_lookup(struct inode dir, struct dentry *dentry,
	de = f2fs_find_entry(dir, &dentry->d_name, &page);		de = f2fs_find_entry(dir, &dentry->d_name, &page);
	if (de) {		if (de) {
	nid_t ino = le32_to_cpu(de->ino);		nid_t ino = le32_to_cpu(de->ino);
			if (!f2fs_has_inline_dentry(dir))
	kunmap(page);		kunmap(page);
	f2fs_put_page(page, 0);		f2fs_put_page(page, 0);

	@@ -219,6 +224,7 @@ static int f2fs_unlink(struct inode dir, struct dentry dentry)
	err = acquire_orphan_inode(sbi);		err = acquire_orphan_inode(sbi);
	if (err) {		if (err) {
	f2fs_unlock_op(sbi);		f2fs_unlock_op(sbi);
			if (!f2fs_has_inline_dentry(dir))
	kunmap(page);		kunmap(page);
	f2fs_put_page(page, 0);		f2fs_put_page(page, 0);
	goto fail;		goto fail;
	@@ -443,6 +449,7 @@ static int f2fs_rename(struct inode old_dir, struct dentry old_dentry,
	old_dir_page, new_dir);		old_dir_page, new_dir);
	update_inode_page(old_inode);		update_inode_page(old_inode);
	} else {		} else {
			if (!f2fs_has_inline_dentry(old_inode))
	kunmap(old_dir_page);		kunmap(old_dir_page);
	f2fs_put_page(old_dir_page, 0);		f2fs_put_page(old_dir_page, 0);
	}		}
	@@ -456,14 +463,17 @@ static int f2fs_rename(struct inode old_dir, struct dentry old_dentry,

	put_out_dir:		put_out_dir:
	f2fs_unlock_op(sbi);		f2fs_unlock_op(sbi);
			if (!f2fs_has_inline_dentry(new_dir))
	kunmap(new_page);		kunmap(new_page);
	f2fs_put_page(new_page, 0);		f2fs_put_page(new_page, 0);
	out_dir:		out_dir:
	if (old_dir_entry) {		if (old_dir_entry) {
			if (!f2fs_has_inline_dentry(old_inode))
	kunmap(old_dir_page);		kunmap(old_dir_page);
	f2fs_put_page(old_dir_page, 0);		f2fs_put_page(old_dir_page, 0);
	}		}
	out_old:		out_old:
			if (!f2fs_has_inline_dentry(old_dir))
	kunmap(old_page);		kunmap(old_page);
	f2fs_put_page(old_page, 0);		f2fs_put_page(old_page, 0);
	out:		out:
	@@ -596,18 +606,22 @@ static int f2fs_cross_rename(struct inode old_dir, struct dentry old_dentry,
	f2fs_unlock_op(sbi);		f2fs_unlock_op(sbi);
	out_new_dir:		out_new_dir:
	if (new_dir_entry) {		if (new_dir_entry) {
			if (!f2fs_has_inline_dentry(new_inode))
	kunmap(new_dir_page);		kunmap(new_dir_page);
	f2fs_put_page(new_dir_page, 0);		f2fs_put_page(new_dir_page, 0);
	}		}
	out_old_dir:		out_old_dir:
	if (old_dir_entry) {		if (old_dir_entry) {
			if (!f2fs_has_inline_dentry(old_inode))
	kunmap(old_dir_page);		kunmap(old_dir_page);
	f2fs_put_page(old_dir_page, 0);		f2fs_put_page(old_dir_page, 0);
	}		}
	out_new:		out_new:
			if (!f2fs_has_inline_dentry(new_dir))
	kunmap(new_page);		kunmap(new_page);
	f2fs_put_page(new_page, 0);		f2fs_put_page(new_page, 0);
	out_old:		out_old:
			if (!f2fs_has_inline_dentry(old_dir))
	kunmap(old_page);		kunmap(old_page);
	f2fs_put_page(old_page, 0);		f2fs_put_page(old_page, 0);
	out:		out:

fs/f2fs/recovery.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -129,6 +129,7 @@ static int recover_dentry(struct inode inode, struct page ipage)
	goto out;		goto out;

	out_unmap_put:		out_unmap_put:
			if (!f2fs_has_inline_dentry(dir))
	kunmap(page);		kunmap(page);
	f2fs_put_page(page, 0);		f2fs_put_page(page, 0);
	out_err:		out_err: