Commit dbeacf02 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: export dir operations for inline dir 



This patch exports some dir operations for inline dir, additionally introduces
f2fs_drop_nlink from f2fs_delete_entry for reusing by inline dir function.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 5efd3c6f

fs/f2fs/dir.c

+38 −33
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static unsigned int bucket_blocks(unsigned int level) 
		return 4;

}



static unsigned char f2fs_filetype_table[F2FS_FT_MAX] = {

unsigned char f2fs_filetype_table[F2FS_FT_MAX] = {

	[F2FS_FT_UNKNOWN]	= DT_UNKNOWN,

	[F2FS_FT_REG_FILE]	= DT_REG,

	[F2FS_FT_DIR]		= DT_DIR,
@@ -59,7 +59,7 @@ static unsigned char f2fs_type_by_mode[S_IFMT >> S_SHIFT] = { 
	[S_IFLNK >> S_SHIFT]	= F2FS_FT_SYMLINK,

};



static void set_de_type(struct f2fs_dir_entry *de, struct inode *inode)

void set_de_type(struct f2fs_dir_entry *de, struct inode *inode)

{

	umode_t mode = inode->i_mode;

	de->file_type = f2fs_type_by_mode[(mode & S_IFMT) >> S_SHIFT];
@@ -77,7 +77,7 @@ static unsigned long dir_block_index(unsigned int level, 
	return bidx;

}



static bool early_match_name(size_t namelen, f2fs_hash_t namehash,

bool early_match_name(size_t namelen, f2fs_hash_t namehash,

				struct f2fs_dir_entry *de)

{

	if (le16_to_cpu(de->name_len) != namelen)
@@ -307,7 +307,6 @@ static int make_empty_dir(struct inode *inode, 
	if (IS_ERR(dentry_page))

		return PTR_ERR(dentry_page);





	dentry_blk = kmap_atomic(dentry_page);



	de = &dentry_blk->dentry[0];
@@ -333,7 +332,7 @@ static int make_empty_dir(struct inode *inode, 
	return 0;

}



static struct page *init_inode_metadata(struct inode *inode,

struct page *init_inode_metadata(struct inode *inode,

		struct inode *dir, const struct qstr *name)

{

	struct page *page;
@@ -395,7 +394,7 @@ static struct page *init_inode_metadata(struct inode *inode, 
	return ERR_PTR(err);

}



static void update_parent_metadata(struct inode *dir, struct inode *inode,

void update_parent_metadata(struct inode *dir, struct inode *inode,

						unsigned int current_depth)

{

	if (is_inode_flag_set(F2FS_I(inode), FI_NEW_INODE)) {
@@ -560,16 +559,44 @@ int f2fs_do_tmpfile(struct inode *inode, struct inode *dir) 
	return err;

}



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

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);



	down_write(&F2FS_I(inode)->i_sem);



	if (S_ISDIR(inode->i_mode)) {

		drop_nlink(dir);

		if (page)

			update_inode(dir, page);

		else

			update_inode_page(dir);

	}

	inode->i_ctime = CURRENT_TIME;



	drop_nlink(inode);

	if (S_ISDIR(inode->i_mode)) {

		drop_nlink(inode);

		i_size_write(inode, 0);

	}

	up_write(&F2FS_I(inode)->i_sem);

	update_inode_page(inode);



	if (inode->i_nlink == 0)

		add_orphan_inode(sbi, inode->i_ino);

	else

		release_orphan_inode(sbi);

}



/*

 * It only removes the dentry from the dentry page, corresponding name

 * entry in name page does not need to be touched during deletion.

 */

void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,

						struct inode *inode)

					struct inode *dir, struct inode *inode)

{

	struct	f2fs_dentry_block *dentry_blk;

	unsigned int bit_pos;

	struct inode *dir = page->mapping->host;

	int slots = GET_DENTRY_SLOTS(le16_to_cpu(dentry->name_len));

	int i;
@@ -590,29 +617,8 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 


	dir->i_ctime = dir->i_mtime = CURRENT_TIME;



	if (inode) {

		struct f2fs_sb_info *sbi = F2FS_I_SB(dir);



		down_write(&F2FS_I(inode)->i_sem);



		if (S_ISDIR(inode->i_mode)) {

			drop_nlink(dir);

			update_inode_page(dir);

		}

		inode->i_ctime = CURRENT_TIME;

		drop_nlink(inode);

		if (S_ISDIR(inode->i_mode)) {

			drop_nlink(inode);

			i_size_write(inode, 0);

		}

		up_write(&F2FS_I(inode)->i_sem);

		update_inode_page(inode);



		if (inode->i_nlink == 0)

			add_orphan_inode(sbi, inode->i_ino);

		else

			release_orphan_inode(sbi);

	}

	if (inode)

		f2fs_drop_nlink(dir, inode, NULL);



	if (bit_pos == NR_DENTRY_IN_BLOCK) {

		truncate_hole(dir, page->index, page->index + 1);
@@ -640,7 +646,6 @@ bool f2fs_empty_dir(struct inode *dir) 
				return false;

		}





		dentry_blk = kmap_atomic(dentry_page);

		if (bidx == 0)

			bit_pos = 2;

fs/f2fs/f2fs.h

+9 −1
Original line number Diff line number Diff line
@@ -1242,6 +1242,13 @@ struct dentry *f2fs_get_parent(struct dentry *child); 
/*

 * dir.c

 */

extern unsigned char f2fs_filetype_table[F2FS_FT_MAX];

bool early_match_name(size_t, f2fs_hash_t, struct f2fs_dir_entry *);

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

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

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

							struct page **);

struct f2fs_dir_entry *f2fs_parent_dir(struct inode *, struct page **);
@@ -1250,7 +1257,8 @@ void f2fs_set_link(struct inode *, struct f2fs_dir_entry *, 
				struct page *, struct inode *);

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

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

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

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

							struct inode *);

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

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

bool f2fs_empty_dir(struct inode *);

fs/f2fs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry) 
		f2fs_put_page(page, 0);

		goto fail;

	}

	f2fs_delete_entry(de, page, inode);

	f2fs_delete_entry(de, page, dir, inode);

	f2fs_unlock_op(sbi);



	/* In order to evict this inode, we set it dirty */
@@ -435,7 +435,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	old_inode->i_ctime = CURRENT_TIME;

	mark_inode_dirty(old_inode);



	f2fs_delete_entry(old_entry, old_page, NULL);

	f2fs_delete_entry(old_entry, old_page, old_dir, NULL);



	if (old_dir_entry) {

		if (old_dir != new_dir) {

fs/f2fs/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int recover_dentry(struct inode *inode, struct page *ipage) 
			iput(einode);

			goto out_unmap_put;

		}

		f2fs_delete_entry(de, page, einode);

		f2fs_delete_entry(de, page, dir, einode);

		iput(einode);

		goto retry;

	}