From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Date: Fri, 31 Oct 2008 07:38:58 +0100 Subject: [Ocfs2-devel] [PATCH 08/27] reiserfs: Use sb_any_quota_loaded() instead of sb_any_quota_enabled(). In-Reply-To: <12254351581363-git-send-email-jack@suse.cz> References: y <12254351572189-git-send-email-jack@suse.cz> <12254351571914-git-send-email-jack@suse.cz> <1225435157625-git-send-email-jack@suse.cz> <1225435157218-git-send-email-jack@suse.cz> <12254351571677-git-send-email-jack@suse.cz> <1225435157894-git-send-email-jack@suse.cz> <12254351582004-git-send-email-jack@suse.cz> <12254351581363-git-send-email-jack@suse.cz> Message-ID: <12254351582759-git-send-email-jack@suse.cz> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ocfs2-devel@oss.oracle.com Signed-off-by: Jan Kara --- fs/reiserfs/super.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 663a91f..a9b393a 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -994,8 +994,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin if (c == 'u' || c == 'g') { int qtype = c == 'u' ? USRQUOTA : GRPQUOTA; - if ((sb_any_quota_enabled(s) || - sb_any_quota_suspended(s)) && + if (sb_any_quota_loaded(s) && (!*arg != !REISERFS_SB(s)->s_qf_names[qtype])) { reiserfs_warning(s, "reiserfs_parse_options: cannot change journaled quota options when quota turned on."); @@ -1041,8 +1040,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin "reiserfs_parse_options: unknown quota format specified."); return 0; } - if ((sb_any_quota_enabled(s) || - sb_any_quota_suspended(s)) && + if (sb_any_quota_loaded(s) && *qfmt != REISERFS_SB(s)->s_jquota_fmt) { reiserfs_warning(s, "reiserfs_parse_options: cannot change journaled quota options when quota turned on."); @@ -1067,7 +1065,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin } /* This checking is not precise wrt the quota type but for our purposes it is sufficient */ if (!(*mount_options & (1 << REISERFS_QUOTA)) - && sb_any_quota_enabled(s)) { + && sb_any_quota_loaded(s)) { reiserfs_warning(s, "reiserfs_parse_options: quota options must be present when quota is turned on."); return 0; -- 1.5.2.4