f2fs: remove blk_plugging in block_operations
authorJaegeuk Kim <jaegeuk@kernel.org>
Fri, 8 May 2020 19:25:45 +0000 (12:25 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 12 May 2020 03:36:47 +0000 (20:36 -0700)
blk_plugging doesn't seem to give any benefit.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/checkpoint.c

index 5ba649e..d49f7a0 100644 (file)
@@ -1166,11 +1166,8 @@ static int block_operations(struct f2fs_sb_info *sbi)
                .nr_to_write = LONG_MAX,
                .for_reclaim = 0,
        };
-       struct blk_plug plug;
        int err = 0, cnt = 0;
 
-       blk_start_plug(&plug);
-
 retry_flush_quotas:
        f2fs_lock_all(sbi);
        if (__need_flush_quota(sbi)) {
@@ -1198,7 +1195,7 @@ retry_flush_dents:
                f2fs_unlock_all(sbi);
                err = f2fs_sync_dirty_inodes(sbi, DIR_INODE);
                if (err)
-                       goto out;
+                       return err;
                cond_resched();
                goto retry_flush_quotas;
        }
@@ -1214,7 +1211,7 @@ retry_flush_dents:
                f2fs_unlock_all(sbi);
                err = f2fs_sync_inode_meta(sbi);
                if (err)
-                       goto out;
+                       return err;
                cond_resched();
                goto retry_flush_quotas;
        }
@@ -1230,7 +1227,7 @@ retry_flush_nodes:
                if (err) {
                        up_write(&sbi->node_change);
                        f2fs_unlock_all(sbi);
-                       goto out;
+                       return err;
                }
                cond_resched();
                goto retry_flush_nodes;
@@ -1242,8 +1239,6 @@ retry_flush_nodes:
         */
        __prepare_cp_block(sbi);
        up_write(&sbi->node_change);
-out:
-       blk_finish_plug(&plug);
        return err;
 }