nilfs2: clean up nilfs_write_super

Separate conditions that check if syncing super block and alternative
super block are required as inline functions to reuse the conditions.

Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>

diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 9926a1d6d225eb1fbfe374811d62f1f6a9bb2f54..70e8613a19541e9fbd79d0e9faec9cb3f20ee284 100644 (file)
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -367,17 +367,12 @@ static void nilfs_write_super(struct super_block *sb)
 
        down_write(&nilfs->ns_sem);
        if (!(sb->s_flags & MS_RDONLY)) {
-               struct nilfs_super_block **sbp = nilfs->ns_sbp;
-               u64 t = get_seconds();
-               int dupsb;
-
-               if (!nilfs_discontinued(nilfs) && t >= nilfs->ns_sbwtime[0] &&
-                   t < nilfs->ns_sbwtime[0] + NILFS_SB_FREQ) {
+               if (!nilfs_discontinued(nilfs) &&
+                   !nilfs_sb_need_update(nilfs)) {
                        up_write(&nilfs->ns_sem);
                        return;
                }
-               dupsb = sbp[1] && t > nilfs->ns_sbwtime[1] + NILFS_ALTSB_FREQ;
-               nilfs_commit_super(sbi, dupsb);
+               nilfs_commit_super(sbi, nilfs_altsb_need_update(nilfs));
        }
        sb->s_dirt = 0;
        up_write(&nilfs->ns_sem);

diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h
index fa3a1dfe40530cbfefa53fda55de73e46e18c692..68e9626e3d44d1c59fb0812f9be0f159e2b0c1e3 100644 (file)
--- a/fs/nilfs2/the_nilfs.h
+++ b/fs/nilfs2/the_nilfs.h
@@ -200,6 +200,20 @@ THE_NILFS_FNS(DISCONTINUED, discontinued)
 #define NILFS_SB_FREQ          10
 #define NILFS_ALTSB_FREQ       60  /* spare superblock */
 
+static inline int nilfs_sb_need_update(struct the_nilfs *nilfs)
+{
+       u64 t = get_seconds();
+       return t < nilfs->ns_sbwtime[0] ||
+                t > nilfs->ns_sbwtime[0] + NILFS_SB_FREQ;
+}
+
+static inline int nilfs_altsb_need_update(struct the_nilfs *nilfs)
+{
+       u64 t = get_seconds();
+       struct nilfs_super_block **sbp = nilfs->ns_sbp;
+       return sbp[1] && t > nilfs->ns_sbwtime[1] + NILFS_ALTSB_FREQ;
+}
+
 void nilfs_set_last_segment(struct the_nilfs *, sector_t, u64, __u64);
 struct the_nilfs *find_or_create_nilfs(struct block_device *);
 void put_nilfs(struct the_nilfs *);