fsck: introduce generic function f2fs_fsync_device

We use f2fs_finalize_device to fsync previous data in
checkpoint area before write last CP pack, in order to avoid
cp corruption in sudden-power-off case. But this function will
close the device, so this patch introduce a function to call
fsync() only.

Signed-off-by: Yunlei He <heyunlei@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fsck/mount.c b/fsck/mount.c
index 7a8aeae..e234fe9 100644 (file)
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -1939,7 +1939,7 @@ void write_checkpoint(struct f2fs_sb_info *sbi)
                write_nat_bits(sbi, sb, cp, sbi->cur_cp);
 
        /* in case of sudden power off */
-       f2fs_finalize_device();
+       f2fs_fsync_device();
 
        /* write the last cp */
        ret = dev_write_block(cp, cp_blk_no++);

diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
index bd609b9..3673817 100644 (file)
--- a/include/f2fs_fs.h
+++ b/include/f2fs_fs.h
@@ -1013,6 +1013,7 @@ extern int f2fs_dev_is_umounted(char *);
 extern int f2fs_get_device_info(void);
 extern int get_device_info(int);
 extern void f2fs_finalize_device(void);
+extern void f2fs_fsync_device(void);
 
 extern int dev_read(void *, __u64, size_t);
 extern int dev_write(void *, __u64, size_t);

diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c
index aa99068..50ff171 100644 (file)
--- a/lib/libf2fs_io.c
+++ b/lib/libf2fs_io.c
@@ -193,6 +193,16 @@ int dev_reada_block(__u64 blk_addr)
        return dev_readahead(blk_addr << F2FS_BLKSIZE_BITS, F2FS_BLKSIZE);
 }
 
+void f2fs_fsync_device(void)
+{
+       int i;
+
+       for (i = 0; i < c.ndevs; i++) {
+               if (fsync(c.devices[i].fd) < 0)
+                       MSG(0, "\tError: Could not conduct fsync!!!\n");
+       }
+}
+
 void f2fs_finalize_device(void)
 {
        int i;