Commit 01b960e9 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: add f2fs_may_inline_{data, dentry} 



This patch adds f2fs_may_inline_data and f2fs_may_inline_dentry.

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

fs/f2fs/f2fs.h

+2 −1
Original line number Diff line number Diff line
@@ -1839,7 +1839,8 @@ extern struct kmem_cache *inode_entry_slab; 
/*

 * inline.c

 */

bool f2fs_may_inline(struct inode *);

bool f2fs_may_inline_data(struct inode *);

bool f2fs_may_inline_dentry(struct inode *);

void read_inline_data(struct page *, struct page *);

bool truncate_inline_inode(struct page *, u64);

int f2fs_read_inline_data(struct inode *, struct page *);

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ void f2fs_truncate(struct inode *inode) 
	trace_f2fs_truncate(inode);



	/* we should check inline_data size */

	if (f2fs_has_inline_data(inode) && !f2fs_may_inline(inode)) {

	if (f2fs_has_inline_data(inode) && !f2fs_may_inline_data(inode)) {

		if (f2fs_convert_inline_inode(inode))

			return;

	}

fs/f2fs/inline.c

+12 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#include "f2fs.h"



bool f2fs_may_inline(struct inode *inode)

bool f2fs_may_inline_data(struct inode *inode)

{

	if (!test_opt(F2FS_I_SB(inode), INLINE_DATA))

		return false;
@@ -30,6 +30,17 @@ bool f2fs_may_inline(struct inode *inode) 
	return true;

}



bool f2fs_may_inline_dentry(struct inode *inode)

{

	if (!test_opt(F2FS_I_SB(inode), INLINE_DENTRY))

		return false;



	if (!S_ISDIR(inode->i_mode))

		return false;



	return true;

}



void read_inline_data(struct page *page, struct page *ipage)

{

	void *src_addr, *dst_addr;

fs/f2fs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode) 
		goto out;

	}



	if (f2fs_may_inline(inode))

	if (f2fs_may_inline_data(inode))

		set_inode_flag(F2FS_I(inode), FI_INLINE_DATA);

	if (test_opt(sbi, INLINE_DENTRY) && S_ISDIR(inode->i_mode))

	if (f2fs_may_inline_dentry(inode))

		set_inode_flag(F2FS_I(inode), FI_INLINE_DENTRY);



	trace_f2fs_new_inode(inode, 0);