Commit a82afa20 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: reuse room_for_filename for inline dentry operation 



This patch introduces to reuse the existing room_for_filename for inline dentry
operation.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent d37a868f

fs/f2fs/dir.c

+9 −12
Original line number Diff line number Diff line
@@ -427,27 +427,23 @@ void update_parent_metadata(struct inode *dir, struct inode *inode, 
		clear_inode_flag(F2FS_I(inode), FI_INC_LINK);

}



static int room_for_filename(struct f2fs_dentry_block *dentry_blk, int slots)

int room_for_filename(const void *bitmap, int slots, int max_slots)

{

	int bit_start = 0;

	int zero_start, zero_end;

next:

	zero_start = find_next_zero_bit_le(&dentry_blk->dentry_bitmap,

						NR_DENTRY_IN_BLOCK,

						bit_start);

	if (zero_start >= NR_DENTRY_IN_BLOCK)

		return NR_DENTRY_IN_BLOCK;

	zero_start = find_next_zero_bit_le(bitmap, max_slots, bit_start);

	if (zero_start >= max_slots)

		return max_slots;



	zero_end = find_next_bit_le(&dentry_blk->dentry_bitmap,

						NR_DENTRY_IN_BLOCK,

						zero_start);

	zero_end = find_next_bit_le(bitmap, max_slots, zero_start);

	if (zero_end - zero_start >= slots)

		return zero_start;



	bit_start = zero_end + 1;



	if (zero_end + 1 >= NR_DENTRY_IN_BLOCK)

		return NR_DENTRY_IN_BLOCK;

	if (zero_end + 1 >= max_slots)

		return max_slots;

	goto next;

}
@@ -509,7 +505,8 @@ int __f2fs_add_link(struct inode *dir, const struct qstr *name, 
			return PTR_ERR(dentry_page);



		dentry_blk = kmap(dentry_page);

		bit_pos = room_for_filename(dentry_blk, slots);

		bit_pos = room_for_filename(&dentry_blk->dentry_bitmap,

						slots, NR_DENTRY_IN_BLOCK);

		if (bit_pos < NR_DENTRY_IN_BLOCK)

			goto add_dentry;

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1248,6 +1248,7 @@ void set_de_type(struct f2fs_dir_entry *, struct inode *); 
struct page *init_inode_metadata(struct inode *, struct inode *,

							const struct qstr *);

void update_parent_metadata(struct inode *, struct inode *, unsigned int);

int room_for_filename(const void *, int, int);

void f2fs_drop_nlink(struct inode *, struct inode *, struct page *);

struct f2fs_dir_entry *f2fs_find_entry(struct inode *, struct qstr *,

							struct page **);

fs/f2fs/inline.c

+2 −25
Original line number Diff line number Diff line
@@ -363,30 +363,6 @@ int make_empty_inline_dir(struct inode *inode, struct inode *parent, 
	return 0;

}



int room_in_inline_dir(struct f2fs_inline_dentry *dentry_blk, int slots)

{

	int bit_start = 0;

	int zero_start, zero_end;

next:

	zero_start = find_next_zero_bit_le(&dentry_blk->dentry_bitmap,

						NR_INLINE_DENTRY,

						bit_start);

	if (zero_start >= NR_INLINE_DENTRY)

		return NR_INLINE_DENTRY;



	zero_end = find_next_bit_le(&dentry_blk->dentry_bitmap,

						NR_INLINE_DENTRY,

						zero_start);

	if (zero_end - zero_start >= slots)

		return zero_start;



	bit_start = zero_end + 1;



	if (zero_end + 1 >= NR_INLINE_DENTRY)

		return NR_INLINE_DENTRY;

	goto next;

}



int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,

				struct f2fs_inline_dentry *inline_dentry)

{
@@ -460,7 +436,8 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *name, 
		return PTR_ERR(ipage);



	dentry_blk = inline_data_addr(ipage);

	bit_pos = room_in_inline_dir(dentry_blk, slots);

	bit_pos = room_for_filename(&dentry_blk->dentry_bitmap,

						slots, NR_INLINE_DENTRY);

	if (bit_pos >= NR_INLINE_DENTRY) {

		err = f2fs_convert_inline_dir(dir, ipage, dentry_blk);

		if (!err)