]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Jan Kara <jack@suse.cz> |
2 | References: fate#302681 | |
3 | Subject: [PATCH 06/28] ext3: Use sb_any_quota_loaded() instead of sb_any_quota_enabled() | |
4 | Patch-mainline: 2.6.29? | |
5 | ||
6 | Signed-off-by: Jan Kara <jack@suse.cz> | |
7 | --- | |
8 | fs/ext3/super.c | 12 ++++-------- | |
9 | 1 files changed, 4 insertions(+), 8 deletions(-) | |
10 | ||
11 | diff --git a/fs/ext3/super.c b/fs/ext3/super.c | |
12 | index f38a5af..ff5b789 100644 | |
13 | --- a/fs/ext3/super.c | |
14 | +++ b/fs/ext3/super.c | |
15 | @@ -1018,8 +1018,7 @@ static int parse_options (char *options, struct super_block *sb, | |
16 | case Opt_grpjquota: | |
17 | qtype = GRPQUOTA; | |
18 | set_qf_name: | |
19 | - if ((sb_any_quota_enabled(sb) || | |
20 | - sb_any_quota_suspended(sb)) && | |
21 | + if (sb_any_quota_loaded(sb) && | |
22 | !sbi->s_qf_names[qtype]) { | |
23 | printk(KERN_ERR | |
24 | "EXT3-fs: Cannot change journaled " | |
25 | @@ -1058,8 +1057,7 @@ set_qf_name: | |
26 | case Opt_offgrpjquota: | |
27 | qtype = GRPQUOTA; | |
28 | clear_qf_name: | |
29 | - if ((sb_any_quota_enabled(sb) || | |
30 | - sb_any_quota_suspended(sb)) && | |
31 | + if (sb_any_quota_loaded(sb) && | |
32 | sbi->s_qf_names[qtype]) { | |
33 | printk(KERN_ERR "EXT3-fs: Cannot change " | |
34 | "journaled quota options when " | |
35 | @@ -1078,8 +1076,7 @@ clear_qf_name: | |
36 | case Opt_jqfmt_vfsv0: | |
37 | qfmt = QFMT_VFS_V0; | |
38 | set_qf_format: | |
39 | - if ((sb_any_quota_enabled(sb) || | |
40 | - sb_any_quota_suspended(sb)) && | |
41 | + if (sb_any_quota_loaded(sb) && | |
42 | sbi->s_jquota_fmt != qfmt) { | |
43 | printk(KERN_ERR "EXT3-fs: Cannot change " | |
44 | "journaled quota options when " | |
45 | @@ -1098,8 +1095,7 @@ set_qf_format: | |
46 | set_opt(sbi->s_mount_opt, GRPQUOTA); | |
47 | break; | |
48 | case Opt_noquota: | |
49 | - if (sb_any_quota_enabled(sb) || | |
50 | - sb_any_quota_suspended(sb)) { | |
51 | + if (sb_any_quota_loaded(sb)) { | |
52 | printk(KERN_ERR "EXT3-fs: Cannot change quota " | |
53 | "options when quota turned on.\n"); | |
54 | return 0; | |
55 | -- | |
56 | 1.5.2.4 | |
57 |