evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

f2fs: add f2fs_may_inline_{data, dentry}

Browse source 
This patch adds f2fs_may_inline_data and f2fs_may_inline_dentry.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Jaegeuk Kim 2015-04-23 10:27:21 -07:00
parent 06957e8fe6
commit 01b960e94a
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/f2fs/f2fs.h
View file

@ -1839,7 +1839,8 @@ extern struct kmem_cache *inode_entry_slab;
/* /*
* inline.c * 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 *); void read_inline_data(struct page *, struct page *);
bool truncate_inline_inode(struct page *, u64); bool truncate_inline_inode(struct page *, u64);
int f2fs_read_inline_data(struct inode *, struct page *); int f2fs_read_inline_data(struct inode *, struct page *);

2
fs/f2fs/file.c
View file

@ -560,7 +560,7 @@ void f2fs_truncate(struct inode *inode)
trace_f2fs_truncate(inode); trace_f2fs_truncate(inode);
/* we should check inline_data size */ /* 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)) if (f2fs_convert_inline_inode(inode))
return; return;
} }

13
fs/f2fs/inline.c
View file

@ -13,7 +13,7 @@
#include "f2fs.h" #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)) if (!test_opt(F2FS_I_SB(inode), INLINE_DATA))
return false; return false;
@ -30,6 +30,17 @@ bool f2fs_may_inline(struct inode *inode)
return true; 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 read_inline_data(struct page *page, struct page *ipage)
{ {
void *src_addr, *dst_addr; void *src_addr, *dst_addr;

4
fs/f2fs/namei.c
View file

@ -56,9 +56,9 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
goto out; goto out;
} }
if (f2fs_may_inline(inode)) if (f2fs_may_inline_data(inode))
set_inode_flag(F2FS_I(inode), FI_INLINE_DATA); 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); set_inode_flag(F2FS_I(inode), FI_INLINE_DENTRY);
trace_f2fs_new_inode(inode, 0); trace_f2fs_new_inode(inode, 0);