f2fs: clean up the do_submit_bio flow

This patch introduces PAGE_TYPE_OF_BIO() and cleans up do_submit_bio() with it.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index c73e3dff6f131e1d00c7eeb57c5236decbbcc6e2..38963b4b500acba2f1a9dd3820ebfdc7c0b677a3 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -350,6 +350,7 @@ enum count_type {
  *                     with waiting the bio's completion
  * ...                 Only can be used with META.
  */
+#define PAGE_TYPE_OF_BIO(type) ((type) > META ? META : (type))
 enum page_type {
        DATA,
        NODE,

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index cfc0eb4f24d528f8a62d217952fec617b48e2769..d5043bdaa1af6fe330f171afc243c17b7614eccc 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -835,32 +835,35 @@ static void do_submit_bio(struct f2fs_sb_info *sbi,
                                enum page_type type, bool sync)
 {
        int rw = sync ? WRITE_SYNC : WRITE;
-       enum page_type btype = type > META ? META : type;
+       enum page_type btype = PAGE_TYPE_OF_BIO(type);
+       struct bio *bio = sbi->bio[btype];
+       struct bio_private *p;
+
+       if (!bio)
+               return;
+
+       sbi->bio[btype] = NULL;
 
        if (type >= META_FLUSH)
                rw = WRITE_FLUSH_FUA;
-
        if (btype == META)
                rw |= REQ_META;
 
-       if (sbi->bio[btype]) {
-               struct bio_private *p = sbi->bio[btype]->bi_private;
-               p->sbi = sbi;
-               sbi->bio[btype]->bi_end_io = f2fs_end_io_write;
+       p = bio->bi_private;
+       p->sbi = sbi;
+       bio->bi_end_io = f2fs_end_io_write;
 
-               trace_f2fs_do_submit_bio(sbi->sb, btype, sync, sbi->bio[btype]);
+       trace_f2fs_do_submit_bio(sbi->sb, btype, sync, bio);
 
-               if (type == META_FLUSH) {
-                       DECLARE_COMPLETION_ONSTACK(wait);
-                       p->is_sync = true;
-                       p->wait = &wait;
-                       submit_bio(rw, sbi->bio[btype]);
-                       wait_for_completion(&wait);
-               } else {
-                       p->is_sync = false;
-                       submit_bio(rw, sbi->bio[btype]);
-               }
-               sbi->bio[btype] = NULL;
+       if (type == META_FLUSH) {
+               DECLARE_COMPLETION_ONSTACK(wait);
+               p->is_sync = true;
+               p->wait = &wait;
+               submit_bio(rw, bio);
+               wait_for_completion(&wait);
+       } else {
+               p->is_sync = false;
+               submit_bio(rw, bio);
        }
 }