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

Commit e001e796 authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: Reset journal parameters after s_mount_opt update 



Right now we're just setting them from the existing parameters, not the
new ones that a remount specified.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 7749c902

fs/ocfs2/super.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -438,14 +438,14 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data) 
	}

	}





	if (!ret) {

	if (!ret) {

		if (!ocfs2_is_hard_readonly(osb))

			ocfs2_set_journal_params(osb);



		/* Only save off the new mount options in case of a successful

		/* Only save off the new mount options in case of a successful

		 * remount. */

		 * remount. */

		osb->s_mount_opt = parsed_options.mount_opt;

		osb->s_mount_opt = parsed_options.mount_opt;

		osb->s_atime_quantum = parsed_options.atime_quantum;

		osb->s_atime_quantum = parsed_options.atime_quantum;

		osb->preferred_slot = parsed_options.slot;

		osb->preferred_slot = parsed_options.slot;



		if (!ocfs2_is_hard_readonly(osb))

			ocfs2_set_journal_params(osb);

	}

	}

out:

out:

	return ret;

	return ret;