]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: Jan Kara <jack@suse.cz> |
2 | References: fate#302681 | |
3 | Subject: [PATCH 08/28] reiserfs: 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/reiserfs/super.c | 8 +++----- | |
9 | 1 file changed, 3 insertions(+), 5 deletions(-) | |
10 | ||
11 | --- a/fs/reiserfs/super.c | |
12 | +++ b/fs/reiserfs/super.c | |
13 | @@ -1002,8 +1002,7 @@ static int reiserfs_parse_options(struct | |
14 | if (c == 'u' || c == 'g') { | |
15 | int qtype = c == 'u' ? USRQUOTA : GRPQUOTA; | |
16 | ||
17 | - if ((sb_any_quota_enabled(s) || | |
18 | - sb_any_quota_suspended(s)) && | |
19 | + if (sb_any_quota_loaded(s) && | |
20 | (!*arg != !REISERFS_SB(s)->s_qf_names[qtype])) { | |
21 | reiserfs_warning(s, "super-6511", | |
22 | "cannot change journaled " | |
23 | @@ -1056,8 +1055,7 @@ static int reiserfs_parse_options(struct | |
24 | "specified."); | |
25 | return 0; | |
26 | } | |
27 | - if ((sb_any_quota_enabled(s) || | |
28 | - sb_any_quota_suspended(s)) && | |
29 | + if (sb_any_quota_loaded(s) && | |
30 | *qfmt != REISERFS_SB(s)->s_jquota_fmt) { | |
31 | reiserfs_warning(s, "super-6515", | |
32 | "cannot change journaled " | |
33 | @@ -1084,7 +1082,7 @@ static int reiserfs_parse_options(struct | |
34 | } | |
35 | /* This checking is not precise wrt the quota type but for our purposes it is sufficient */ | |
36 | if (!(*mount_options & (1 << REISERFS_QUOTA)) | |
37 | - && sb_any_quota_enabled(s)) { | |
38 | + && sb_any_quota_loaded(s)) { | |
39 | reiserfs_warning(s, "super-6516", "quota options must " | |
40 | "be present when quota is turned on."); | |
41 | return 0; |