ext4: only set EXT4_MOUNT_QUOTA when journalled quota file is specified

Lukas Czerner · tytso · commit 4c1bd5a90c4e · 2022-01-10T13:25:55.000-05:00
Only set EXT4_MOUNT_QUOTA when journalled quota file is specified, otherwise simply disabling specific quota type (usrjquota=) will also set the EXT4_MOUNT_QUOTA super block option. Signed-off-by: Lukas Czerner <lczerner@redhat.com> Fixes: e6e268c ("ext4: move quota configuration out of handle_mount_opt()") Link: https://lore.kernel.org/r/20220104143518.134465-2-lczerner@redhat.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
@@ -2635,12 +2635,13 @@ static void ext4_apply_quota_options(struct fs_context *fc,
 				continue;
 
 			qname = ctx->s_qf_names[i]; /* May be NULL */
+			if (qname)
+				set_opt(sb, QUOTA);
 			ctx->s_qf_names[i] = NULL;
 			qname = rcu_replace_pointer(sbi->s_qf_names[i], qname,
 						lockdep_is_held(&sb->s_umount));
 			if (qname)
 				kfree_rcu(qname);
-			set_opt(sb, QUOTA);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2635,12 +2635,13 @@ static void ext4_apply_quota_options(struct fs_context *fc,`
`2635`	`2635`	`continue;`
`2636`	`2636`
`2637`	`2637`	`qname = ctx->s_qf_names[i]; /* May be NULL */`
	`2638`	`+ if (qname)`
	`2639`	`+ set_opt(sb, QUOTA);`
`2638`	`2640`	`ctx->s_qf_names[i] = NULL;`
`2639`	`2641`	`qname = rcu_replace_pointer(sbi->s_qf_names[i], qname,`
`2640`	`2642`	`lockdep_is_held(&sb->s_umount));`
`2641`	`2643`	`if (qname)`
`2642`	`2644`	`kfree_rcu(qname);`
`2643`		`- set_opt(sb, QUOTA);`
`2644`	`2645`	`}`
`2645`	`2646`	`}`
`2646`	`2647`