Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f50a4c81 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: move recovery completion into load_nilfs function 



Although mount recovery of nilfs is integrated in load_nilfs()
procedure, the completion of recovery was isolated from the procedure
and performed at the end of the fill_super routine.

This was somewhat confusing since the recovery is needed for the nilfs
object, not for a super block instance.

To resolve the inconsistency, this will integrate the recovery
completion into load_nilfs().

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 050b4142

fs/nilfs2/super.c

+5 −34
Original line number Diff line number Diff line
@@ -414,22 +414,6 @@ void nilfs_detach_checkpoint(struct nilfs_sb_info *sbi) 
	up_write(&nilfs->ns_super_sem);

}



static int nilfs_mark_recovery_complete(struct nilfs_sb_info *sbi)

{

	struct the_nilfs *nilfs = sbi->s_nilfs;

	int err = 0;



	down_write(&nilfs->ns_sem);

	if (!(nilfs->ns_mount_state & NILFS_VALID_FS)) {

		nilfs->ns_mount_state |= NILFS_VALID_FS;

		err = nilfs_commit_super(sbi, 1);

		if (likely(!err))

			printk(KERN_INFO "NILFS: recovery complete.\n");

	}

	up_write(&nilfs->ns_sem);

	return err;

}



static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf)

{

	struct super_block *sb = dentry->d_sb;
@@ -649,9 +633,7 @@ static int nilfs_setup_super(struct nilfs_sb_info *sbi) 
	int mnt_count = le16_to_cpu(sbp->s_mnt_count);



	/* nilfs->sem must be locked by the caller. */

	if (!(nilfs->ns_mount_state & NILFS_VALID_FS)) {

		printk(KERN_WARNING "NILFS warning: mounting unchecked fs\n");

	} else if (nilfs->ns_mount_state & NILFS_ERROR_FS) {

	if (nilfs->ns_mount_state & NILFS_ERROR_FS) {

		printk(KERN_WARNING

		       "NILFS warning: mounting fs with errors\n");

#if 0
@@ -759,11 +741,10 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent, 
	sb->s_root = NULL;

	sb->s_time_gran = 1;



	if (!nilfs_loaded(nilfs)) {

	err = load_nilfs(nilfs, sbi);

	if (err)

		goto failed_sbi;

	}



	cno = nilfs_last_cno(nilfs);



	if (sb->s_flags & MS_RDONLY) {
@@ -831,12 +812,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent, 
		up_write(&nilfs->ns_sem);

	}



	err = nilfs_mark_recovery_complete(sbi);

	if (unlikely(err)) {

		printk(KERN_ERR "NILFS: recovery failed.\n");

		goto failed_root;

	}



	down_write(&nilfs->ns_super_sem);

	if (!nilfs_test_opt(sbi, SNAPSHOT))

		nilfs->ns_current = sbi;
@@ -844,10 +819,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent, 


	return 0;



 failed_root:

	dput(sb->s_root);

	sb->s_root = NULL;



 failed_segctor:

	nilfs_detach_segment_constructor(sbi);

fs/nilfs2/the_nilfs.c

+48 −22
Original line number Diff line number Diff line
@@ -262,27 +262,26 @@ int load_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi) 
	unsigned int s_flags = sbi->s_super->s_flags;

	int really_read_only = bdev_read_only(nilfs->ns_bdev);

	unsigned valid_fs;

	int err = 0;

	int err;



	nilfs_init_recovery_info(&ri);

	if (nilfs_loaded(nilfs))

		return 0;



	down_write(&nilfs->ns_sem);

	valid_fs = (nilfs->ns_mount_state & NILFS_VALID_FS);

	up_write(&nilfs->ns_sem);



	if (!valid_fs && (s_flags & MS_RDONLY)) {

	if (!valid_fs) {

		printk(KERN_WARNING "NILFS warning: mounting unchecked fs\n");

		if (s_flags & MS_RDONLY) {

			printk(KERN_INFO "NILFS: INFO: recovery "

			       "required for readonly filesystem.\n");

		if (really_read_only) {

			printk(KERN_ERR "NILFS: write access "

			       "unavailable, cannot proceed.\n");

			err = -EROFS;

			goto failed;

		}

			printk(KERN_INFO "NILFS: write access will "

			       "be enabled during recovery.\n");

		sbi->s_super->s_flags &= ~MS_RDONLY;

		}

	}



	nilfs_init_recovery_info(&ri);



	err = nilfs_search_super_root(nilfs, sbi, &ri);

	if (unlikely(err)) {
@@ -296,19 +295,46 @@ int load_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi) 
		goto failed;

	}



	if (!valid_fs) {

		err = nilfs_recover_logical_segments(nilfs, sbi, &ri);

		if (unlikely(err)) {

			nilfs_mdt_destroy(nilfs->ns_cpfile);

			nilfs_mdt_destroy(nilfs->ns_sufile);

			nilfs_mdt_destroy(nilfs->ns_dat);

			goto failed;

	if (valid_fs)

		goto skip_recovery;



	if (s_flags & MS_RDONLY) {

		if (really_read_only) {

			printk(KERN_ERR "NILFS: write access "

			       "unavailable, cannot proceed.\n");

			err = -EROFS;

			goto failed_unload;

		}

		if (ri.ri_need_recovery == NILFS_RECOVERY_SR_UPDATED)

			sbi->s_super->s_dirt = 1;

		sbi->s_super->s_flags &= ~MS_RDONLY;

	}



	err = nilfs_recover_logical_segments(nilfs, sbi, &ri);

	if (err)

		goto failed_unload;



	down_write(&nilfs->ns_sem);

	nilfs->ns_mount_state |= NILFS_VALID_FS;

	nilfs->ns_sbp[0]->s_state = cpu_to_le16(nilfs->ns_mount_state);

	err = nilfs_commit_super(sbi, 1);

	up_write(&nilfs->ns_sem);



	if (err) {

		printk(KERN_ERR "NILFS: failed to update super block. "

		       "recovery unfinished.\n");

		goto failed_unload;

	}

	printk(KERN_INFO "NILFS: recovery complete.\n");



 skip_recovery:

	set_nilfs_loaded(nilfs);

	nilfs_clear_recovery_info(&ri);

	sbi->s_super->s_flags = s_flags;

	return 0;



 failed_unload:

	nilfs_mdt_destroy(nilfs->ns_cpfile);

	nilfs_mdt_destroy(nilfs->ns_sufile);

	nilfs_mdt_destroy(nilfs->ns_dat);



 failed:

	nilfs_clear_recovery_info(&ri);