diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nilfs2/the_nilfs.c | 1 | ||||
-rw-r--r-- | fs/nilfs2/the_nilfs.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index 0254be2d73c6..95e444319f12 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c | |||
@@ -329,7 +329,6 @@ int load_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi) | |||
329 | printk(KERN_INFO "NILFS: recovery complete.\n"); | 329 | printk(KERN_INFO "NILFS: recovery complete.\n"); |
330 | 330 | ||
331 | skip_recovery: | 331 | skip_recovery: |
332 | set_nilfs_loaded(nilfs); | ||
333 | nilfs_clear_recovery_info(&ri); | 332 | nilfs_clear_recovery_info(&ri); |
334 | sbi->s_super->s_flags = s_flags; | 333 | sbi->s_super->s_flags = s_flags; |
335 | return 0; | 334 | return 0; |
diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h index 69226e14b745..fd85e4c05c6b 100644 --- a/fs/nilfs2/the_nilfs.h +++ b/fs/nilfs2/the_nilfs.h | |||
@@ -36,8 +36,6 @@ | |||
36 | /* the_nilfs struct */ | 36 | /* the_nilfs struct */ |
37 | enum { | 37 | enum { |
38 | THE_NILFS_INIT = 0, /* Information from super_block is set */ | 38 | THE_NILFS_INIT = 0, /* Information from super_block is set */ |
39 | THE_NILFS_LOADED, /* Roll-back/roll-forward has done and | ||
40 | the latest checkpoint was loaded */ | ||
41 | THE_NILFS_DISCONTINUED, /* 'next' pointer chain has broken */ | 39 | THE_NILFS_DISCONTINUED, /* 'next' pointer chain has broken */ |
42 | THE_NILFS_GC_RUNNING, /* gc process is running */ | 40 | THE_NILFS_GC_RUNNING, /* gc process is running */ |
43 | THE_NILFS_SB_DIRTY, /* super block is dirty */ | 41 | THE_NILFS_SB_DIRTY, /* super block is dirty */ |
@@ -178,7 +176,6 @@ static inline int nilfs_##name(struct the_nilfs *nilfs) \ | |||
178 | } | 176 | } |
179 | 177 | ||
180 | THE_NILFS_FNS(INIT, init) | 178 | THE_NILFS_FNS(INIT, init) |
181 | THE_NILFS_FNS(LOADED, loaded) | ||
182 | THE_NILFS_FNS(DISCONTINUED, discontinued) | 179 | THE_NILFS_FNS(DISCONTINUED, discontinued) |
183 | THE_NILFS_FNS(GC_RUNNING, gc_running) | 180 | THE_NILFS_FNS(GC_RUNNING, gc_running) |
184 | THE_NILFS_FNS(SB_DIRTY, sb_dirty) | 181 | THE_NILFS_FNS(SB_DIRTY, sb_dirty) |