aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiro SEKIBA <jir@unicus.jp>2009-07-23 01:26:34 +0900
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2009-09-14 18:27:14 +0900
commit79efdd94111f30c373fce05e4e5822d8ff671c2a (patch)
tree9d12c0e87146fb4fb63362f567e574d629a222a1
parent6233caa9d5b153c2190d6c1c35c1dd1010104fc1 (diff)
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>
-rw-r--r--fs/nilfs2/super.c11
-rw-r--r--fs/nilfs2/the_nilfs.h14
2 files changed, 17 insertions, 8 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 9926a1d6d22..70e8613a195 100644
--- 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 fa3a1dfe405..68e9626e3d4 100644
--- 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 *);