lkml.org 
[lkml]   [2008]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/56] ext3: Use sb_any_quota_loaded() instead of sb_any_quota_enabled()
    Date
    From: Jan Kara <jack@suse.cz>

    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Mark Fasheh <mfasheh@suse.com>
    ---
    fs/ext3/super.c | 12 ++++--------
    1 files changed, 4 insertions(+), 8 deletions(-)

    diff --git a/fs/ext3/super.c b/fs/ext3/super.c
    index f6c94f2..250ec53 100644
    --- a/fs/ext3/super.c
    +++ b/fs/ext3/super.c
    @@ -1035,8 +1035,7 @@ static int parse_options (char *options, struct super_block *sb,
    case Opt_grpjquota:
    qtype = GRPQUOTA;
    set_qf_name:
    - if ((sb_any_quota_enabled(sb) ||
    - sb_any_quota_suspended(sb)) &&
    + if (sb_any_quota_loaded(sb) &&
    !sbi->s_qf_names[qtype]) {
    printk(KERN_ERR
    "EXT3-fs: Cannot change journaled "
    @@ -1075,8 +1074,7 @@ set_qf_name:
    case Opt_offgrpjquota:
    qtype = GRPQUOTA;
    clear_qf_name:
    - if ((sb_any_quota_enabled(sb) ||
    - sb_any_quota_suspended(sb)) &&
    + if (sb_any_quota_loaded(sb) &&
    sbi->s_qf_names[qtype]) {
    printk(KERN_ERR "EXT3-fs: Cannot change "
    "journaled quota options when "
    @@ -1095,8 +1093,7 @@ clear_qf_name:
    case Opt_jqfmt_vfsv0:
    qfmt = QFMT_VFS_V0;
    set_qf_format:
    - if ((sb_any_quota_enabled(sb) ||
    - sb_any_quota_suspended(sb)) &&
    + if (sb_any_quota_loaded(sb) &&
    sbi->s_jquota_fmt != qfmt) {
    printk(KERN_ERR "EXT3-fs: Cannot change "
    "journaled quota options when "
    @@ -1115,8 +1112,7 @@ set_qf_format:
    set_opt(sbi->s_mount_opt, GRPQUOTA);
    break;
    case Opt_noquota:
    - if (sb_any_quota_enabled(sb) ||
    - sb_any_quota_suspended(sb)) {
    + if (sb_any_quota_loaded(sb)) {
    printk(KERN_ERR "EXT3-fs: Cannot change quota "
    "options when quota turned on.\n");
    return 0;
    --
    1.5.6


    \
     
     \ /
      Last update: 2008-12-22 22:55    [W:4.669 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site