f2fs: fix to recover data written by dio
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/3 f2fs: fix to recover data written by dio
If data are overwritten through dio, previous f2fs doesn't remain the fsync mark due to no additional node writes.
Note that this patch should resolve the xfstests:311.
--- fs/f2fs/data.c | 3 +++ fs/f2fs/f2fs.h | 1 + fs/f2fs/node.c | 12 ++++++++++++ 3 files changed, 16 insertions(+)
fs/f2fs/data.c +3 -0
@@ -1041,6 +1041,9 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb,if (check_direct_IO (inode, rw, iov, offset, nr_segs))return 0 ; +/* clear fsync mark to recover these blocks */ +fsync_mark_clear (F2FS_SB (inode->i_sb), inode->i_ino); +return blockdev_direct_IO (rw, iocb, inode, iov, offset, nr_segs, get_data_block); }
fs/f2fs/f2fs.h +1 -0
@@ -1168,6 +1168,7 @@ struct node_info;bool available_free_memory (struct f2fs_sb_info *,int );int is_checkpointed_node (struct f2fs_sb_info *,nid_t );bool fsync_mark_done (struct f2fs_sb_info *,nid_t ); +void fsync_mark_clear (struct f2fs_sb_info *,nid_t );void get_node_info (struct f2fs_sb_info *,nid_t ,struct node_info *);int get_dnode_of_data (struct dnode_of_data *,pgoff_t ,int );int truncate_inode_blocks (struct inode *,pgoff_t );
fs/f2fs/node.c +12 -0
@@ -153,6 +153,18 @@ bool fsync_mark_done(struct f2fs_sb_info *sbi, nid_t nid)return fsync_done; } +void fsync_mark_clear (struct f2fs_sb_info *sbi,nid_t nid) +{ +struct f2fs_nm_info *nm_i =NM_I (sbi); +struct nat_entry *e; + +write_lock (&nm_i->nat_tree_lock); + e =__lookup_nat_cache (nm_i, nid); +if (e) + e->fsync_done = false; +write_unlock (&nm_i->nat_tree_lock); +} +static struct nat_entry *grab_nat_entry (struct f2fs_nm_info *nm_i,nid_t nid) {struct nat_entry *new;
Signature · 9 lines
1.8.5.2 (Apple Git-48) ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech
Jaegeuk Kim
maintainerPATCH 2/3 f2fs: recover fallocated space
If a fallocated file is fsynced, we should recover the i_size after sudden power cut.
--- fs/f2fs/file.c | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/file.c +1 -0
@@ -682,6 +682,7 @@ static int expand_inode_data(struct inode *inode, loff_t offset, i_size_read(inode) < new_size) {i_size_write (inode, new_size);mark_inode_dirty (inode); +f2fs_write_inode (inode,NULL ); }return ret;
Signature · 9 lines
1.8.5.2 (Apple Git-48) ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech
Jaegeuk Kim
maintainerPATCH 3/3 f2fs: avoid not to call remove_dirty_inode
In reply to Jaegeuk KimThere is an errorneous case during the recovery like below.
In recovery_dentry,
1) dir = f2fs_iget();
2) mark the dir with FI_DELAY_IPUT
3) goto unmap_out
After the end of recovery routine, there is no dirty dentries so the dir cannot be released by iput in remove_dirty_dir_inode.
This patch fixes such the bug case by handling the iget and iput in the recovery_dentry procedure.
--- fs/f2fs/recovery.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
fs/f2fs/recovery.c +13 -8
@@ -52,20 +52,13 @@ static int recover_dentry(struct page *ipage, struct inode *inode) goto out; } -if (is_inode_flag_set (F2FS_I (dir),FI_DIRTY_DIR )) { -iput (dir); - }else { -add_dirty_dir_inode (dir); -set_inode_flag (F2FS_I (dir),FI_DELAY_IPUT ); - } - name.len =le32_to_cpu (raw_inode->i_namelen); name.name = raw_inode->i_name;if (unlikely (name.len >F2FS_NAME_LEN )) {WARN_ON (1 ); err = -ENAMETOOLONG ; - goto out; + goto out_err; } retry: de =f2fs_find_entry (dir, &name, &page);
@@ -90,11 +83,23 @@ retry: goto retry; } err =__f2fs_add_link (dir, &name, inode); +if (err) + goto out_err; + +if (is_inode_flag_set (F2FS_I (dir),FI_DELAY_IPUT )) { +iput (dir); + }else { +add_dirty_dir_inode (dir); +set_inode_flag (F2FS_I (dir),FI_DELAY_IPUT ); + } + goto out; out_unmap_put:kunmap (page);f2fs_put_page (page,0 ); +out_err: +iput (dir); out: f2fs_msg(inode->i_sb, KERN_NOTICE, "%s: ino = %x, name = %s, dir = %lx, err = %d",
Signature · 9 lines
1.8.5.2 (Apple Git-48) ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech