diff options
Diffstat (limited to 'fs/nilfs2/recovery.c')
-rw-r--r-- | fs/nilfs2/recovery.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/nilfs2/recovery.c b/fs/nilfs2/recovery.c index ef387b19682c..6ab4c8fc5e9f 100644 --- a/fs/nilfs2/recovery.c +++ b/fs/nilfs2/recovery.c | |||
@@ -463,16 +463,6 @@ static int nilfs_prepare_segment_for_recovery(struct the_nilfs *nilfs, | |||
463 | nilfs_free_segment_entry(ent); | 463 | nilfs_free_segment_entry(ent); |
464 | } | 464 | } |
465 | 465 | ||
466 | /* | ||
467 | * The segment having the latest super root is active, and | ||
468 | * should be deactivated on the next construction for recovery. | ||
469 | */ | ||
470 | err = -ENOMEM; | ||
471 | ent = nilfs_alloc_segment_entry(segnum[0]); | ||
472 | if (unlikely(!ent)) | ||
473 | goto failed; | ||
474 | list_add_tail(&ent->list, &ri->ri_used_segments); | ||
475 | |||
476 | /* Allocate new segments for recovery */ | 466 | /* Allocate new segments for recovery */ |
477 | err = nilfs_sufile_alloc(sufile, &segnum[0]); | 467 | err = nilfs_sufile_alloc(sufile, &segnum[0]); |
478 | if (unlikely(err)) | 468 | if (unlikely(err)) |
@@ -757,7 +747,7 @@ int nilfs_recover_logical_segments(struct the_nilfs *nilfs, | |||
757 | goto failed; | 747 | goto failed; |
758 | } | 748 | } |
759 | 749 | ||
760 | err = nilfs_attach_segment_constructor(sbi, ri); | 750 | err = nilfs_attach_segment_constructor(sbi); |
761 | if (unlikely(err)) | 751 | if (unlikely(err)) |
762 | goto failed; | 752 | goto failed; |
763 | 753 | ||