Signed-off-by: Jiro SEKIBA <[email protected]>
---
fs/nilfs2/super.c | 8 ++------
fs/nilfs2/the_nilfs.h | 10 ++++++++++
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index ba69601..55a4359 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -368,17 +368,13 @@ 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_update_super(nilfs,t))
{
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_update_alt_super(nilfs,t));
}
sb->s_dirt = 0;
up_write(&nilfs->ns_sem);
diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h
index e8adbff..ee448ea 100644
--- a/fs/nilfs2/the_nilfs.h
+++ b/fs/nilfs2/the_nilfs.h
@@ -201,6 +201,16 @@ THE_NILFS_FNS(DISCONTINUED, discontinued)
/* Minimum interval of periodical update of superblocks (in seconds) */
#define NILFS_SB_FREQ 10
#define NILFS_ALTSB_FREQ 60 /* spare superblock */
+static inline int nilfs_update_super(struct the_nilfs *nilfs, u64 t)
+{
+ return t < nilfs->ns_sbwtime[0] || t > nilfs->ns_sbwtime[0] + NILFS_SB_FREQ;
+}
+
+static inline int nilfs_update_alt_super(struct the_nilfs *nilfs, u64 t)
+{
+ 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 *);
--
1.5.6.5
_______________________________________________
users mailing list
[email protected]
https://www.nilfs.org/mailman/listinfo/users
