|
@@ -67,29 +67,23 @@ static void __set_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static int __recover_inline_status(struct inode *inode, struct page *ipage)
|
|
|
+static void __recover_inline_status(struct inode *inode, struct page *ipage)
|
|
|
{
|
|
|
void *inline_data = inline_data_addr(ipage);
|
|
|
- struct f2fs_inode *ri;
|
|
|
- void *zbuf;
|
|
|
+ __le32 *start = inline_data;
|
|
|
+ __le32 *end = start + MAX_INLINE_DATA / sizeof(__le32);
|
|
|
|
|
|
- zbuf = kzalloc(MAX_INLINE_DATA, GFP_NOFS);
|
|
|
- if (!zbuf)
|
|
|
- return -ENOMEM;
|
|
|
+ while (start < end) {
|
|
|
+ if (*start++) {
|
|
|
+ f2fs_wait_on_page_writeback(ipage, NODE);
|
|
|
|
|
|
- if (!memcmp(zbuf, inline_data, MAX_INLINE_DATA)) {
|
|
|
- kfree(zbuf);
|
|
|
- return 0;
|
|
|
+ set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
|
|
|
+ set_raw_inline(F2FS_I(inode), F2FS_INODE(ipage));
|
|
|
+ set_page_dirty(ipage);
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
- kfree(zbuf);
|
|
|
-
|
|
|
- f2fs_wait_on_page_writeback(ipage, NODE);
|
|
|
- set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
|
|
|
-
|
|
|
- ri = F2FS_INODE(ipage);
|
|
|
- set_raw_inline(F2FS_I(inode), ri);
|
|
|
- set_page_dirty(ipage);
|
|
|
- return 0;
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
static int do_read_inode(struct inode *inode)
|
|
@@ -98,7 +92,6 @@ static int do_read_inode(struct inode *inode)
|
|
|
struct f2fs_inode_info *fi = F2FS_I(inode);
|
|
|
struct page *node_page;
|
|
|
struct f2fs_inode *ri;
|
|
|
- int err = 0;
|
|
|
|
|
|
/* Check if ino is within scope */
|
|
|
if (check_nid_range(sbi, inode->i_ino)) {
|
|
@@ -142,7 +135,7 @@ static int do_read_inode(struct inode *inode)
|
|
|
|
|
|
/* check data exist */
|
|
|
if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode))
|
|
|
- err = __recover_inline_status(inode, node_page);
|
|
|
+ __recover_inline_status(inode, node_page);
|
|
|
|
|
|
/* get rdev by using inline_info */
|
|
|
__get_inode_rdev(inode, ri);
|
|
@@ -152,7 +145,7 @@ static int do_read_inode(struct inode *inode)
|
|
|
stat_inc_inline_inode(inode);
|
|
|
stat_inc_inline_dir(inode);
|
|
|
|
|
|
- return err;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
|