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

Commit 91f1953b authored by Jiro SEKIBA's avatar Jiro SEKIBA Committed by Ryusuke Konishi
Browse files

nilfs2: Using nobarrier option instead of barrier=off 



Since most of fs using nofoobar style option,
modified barrier=off option as nobarrier.

Signed-off-by: default avatarJiro SEKIBA <jir@unicus.jp>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 6600b9dd

Documentation/filesystems/nilfs2.txt

+1 −2
Original line number Original line Diff line number Diff line
@@ -49,8 +49,7 @@ Mount options 
NILFS2 supports the following mount options:

NILFS2 supports the following mount options:

(*) == default

(*) == default





barrier=on(*)		This enables/disables barriers. barrier=off disables

nobarrier		Disables barriers.

			it, barrier=on enables it.

errors=continue(*)	Keep going on a filesystem error.

errors=continue(*)	Keep going on a filesystem error.

errors=remount-ro	Remount the filesystem read-only on an error.

errors=remount-ro	Remount the filesystem read-only on an error.

errors=panic		Panic and halt the machine if an error occurs.

errors=panic		Panic and halt the machine if an error occurs.

fs/nilfs2/super.c

+5 −10
Original line number Original line Diff line number Diff line
@@ -490,7 +490,7 @@ static int nilfs_show_options(struct seq_file *seq, struct vfsmount *vfs) 
	struct nilfs_sb_info *sbi = NILFS_SB(sb);

	struct nilfs_sb_info *sbi = NILFS_SB(sb);





	if (!nilfs_test_opt(sbi, BARRIER))

	if (!nilfs_test_opt(sbi, BARRIER))

		seq_printf(seq, ",barrier=off");

		seq_printf(seq, ",nobarrier");

	if (nilfs_test_opt(sbi, SNAPSHOT))

	if (nilfs_test_opt(sbi, SNAPSHOT))

		seq_printf(seq, ",cp=%llu",

		seq_printf(seq, ",cp=%llu",

			   (unsigned long long int)sbi->s_snapshot_cno);

			   (unsigned long long int)sbi->s_snapshot_cno);
@@ -568,7 +568,7 @@ static const struct export_operations nilfs_export_ops = { 




enum {

enum {

	Opt_err_cont, Opt_err_panic, Opt_err_ro,

	Opt_err_cont, Opt_err_panic, Opt_err_ro,

	Opt_barrier, Opt_snapshot, Opt_order,

	Opt_nobarrier, Opt_snapshot, Opt_order,

	Opt_err,

	Opt_err,

};

};
@@ -576,7 +576,7 @@ static match_table_t tokens = { 
	{Opt_err_cont, "errors=continue"},

	{Opt_err_cont, "errors=continue"},

	{Opt_err_panic, "errors=panic"},

	{Opt_err_panic, "errors=panic"},

	{Opt_err_ro, "errors=remount-ro"},

	{Opt_err_ro, "errors=remount-ro"},

	{Opt_barrier, "barrier=%s"},

	{Opt_nobarrier, "nobarrier"},

	{Opt_snapshot, "cp=%u"},

	{Opt_snapshot, "cp=%u"},

	{Opt_order, "order=%s"},

	{Opt_order, "order=%s"},

	{Opt_err, NULL}

	{Opt_err, NULL}
@@ -612,12 +612,7 @@ static int parse_options(char *options, struct super_block *sb) 




		token = match_token(p, tokens, args);

		token = match_token(p, tokens, args);

		switch (token) {

		switch (token) {

		case Opt_barrier:

		case Opt_nobarrier:

			if (match_bool(&args[0], &option))

				return 0;

			if (option)

				nilfs_set_opt(sbi, BARRIER);

			else

			nilfs_clear_opt(sbi, BARRIER);

			nilfs_clear_opt(sbi, BARRIER);

			break;

			break;

		case Opt_order:

		case Opt_order: