projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pwm/for-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[deliverable/linux.git]
/
fs
/
f2fs
/
inode.c
diff --git
a/fs/f2fs/inode.c
b/fs/f2fs/inode.c
index 2adeff26be11b9689dde24a5d22b0bd3351c21b7..cb269c46ac254ff6f508f9bd21a79028d3ae754e 100644
(file)
--- a/
fs/f2fs/inode.c
+++ b/
fs/f2fs/inode.c
@@
-83,7
+83,7
@@
static void __recover_inline_status(struct inode *inode, struct page *ipage)
while (start < end) {
if (*start++) {
while (start < end) {
if (*start++) {
- f2fs_wait_on_page_writeback(ipage, NODE);
+ f2fs_wait_on_page_writeback(ipage, NODE
, true
);
set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
set_raw_inline(F2FS_I(inode), F2FS_INODE(ipage));
set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
set_raw_inline(F2FS_I(inode), F2FS_INODE(ipage));
@@
-227,7
+227,7
@@
int update_inode(struct inode *inode, struct page *node_page)
{
struct f2fs_inode *ri;
{
struct f2fs_inode *ri;
- f2fs_wait_on_page_writeback(node_page, NODE);
+ f2fs_wait_on_page_writeback(node_page, NODE
, true
);
ri = F2FS_INODE(node_page);
ri = F2FS_INODE(node_page);
@@
-263,6
+263,10
@@
int update_inode(struct inode *inode, struct page *node_page)
set_cold_node(inode, node_page);
clear_inode_flag(F2FS_I(inode), FI_DIRTY_INODE);
set_cold_node(inode, node_page);
clear_inode_flag(F2FS_I(inode), FI_DIRTY_INODE);
+ /* deleted inode */
+ if (inode->i_nlink == 0)
+ clear_inline_node(node_page);
+
return set_page_dirty(node_page);
}
return set_page_dirty(node_page);
}
@@
-320,7
+324,7
@@
void f2fs_evict_inode(struct inode *inode)
/* some remained atomic pages should discarded */
if (f2fs_is_atomic_file(inode))
/* some remained atomic pages should discarded */
if (f2fs_is_atomic_file(inode))
-
commit_inmem_pages(inode, tru
e);
+
drop_inmem_pages(inod
e);
trace_f2fs_evict_inode(inode);
truncate_inode_pages_final(&inode->i_data);
trace_f2fs_evict_inode(inode);
truncate_inode_pages_final(&inode->i_data);
@@
-385,10
+389,7
@@
no_delete:
}
}
out_clear:
}
}
out_clear:
-#ifdef CONFIG_F2FS_FS_ENCRYPTION
- if (fi->i_crypt_info)
- f2fs_free_encryption_info(inode, fi->i_crypt_info);
-#endif
+ fscrypt_put_encryption_info(inode, NULL);
clear_inode(inode);
}
clear_inode(inode);
}
This page took
0.172289 seconds
and
5
git commands to generate.