Merge remote-tracking branch 'regulator/for-next'

[deliverable/linux.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 3ec8708989ca016c3dd9e7e2d9bd479a1cd9beaf..ebeebf5b9571c00f4fa51cda0985e3aff88dcd1a 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1267,7 +1267,7 @@ enum {
        Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
        Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
        Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
-       Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_dax,
+       Opt_usrquota, Opt_grpquota, Opt_prjquota, Opt_i_version, Opt_dax,
        Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
        Opt_lazytime, Opt_nolazytime,
        Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
@@ -1327,6 +1327,7 @@ static const match_table_t tokens = {
        {Opt_noquota, "noquota"},
        {Opt_quota, "quota"},
        {Opt_usrquota, "usrquota"},
+       {Opt_prjquota, "prjquota"},
        {Opt_barrier, "barrier=%u"},
        {Opt_barrier, "barrier"},
        {Opt_nobarrier, "nobarrier"},
@@ -1546,8 +1547,11 @@ static const struct mount_opts {
                                                        MOPT_SET | MOPT_Q},
        {Opt_grpquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_GRPQUOTA,
                                                        MOPT_SET | MOPT_Q},
+       {Opt_prjquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_PRJQUOTA,
+                                                       MOPT_SET | MOPT_Q},
        {Opt_noquota, (EXT4_MOUNT_QUOTA | EXT4_MOUNT_USRQUOTA |
-                      EXT4_MOUNT_GRPQUOTA), MOPT_CLEAR | MOPT_Q},
+                      EXT4_MOUNT_GRPQUOTA | EXT4_MOUNT_PRJQUOTA),
+                                                       MOPT_CLEAR | MOPT_Q},
        {Opt_usrjquota, 0, MOPT_Q},
        {Opt_grpjquota, 0, MOPT_Q},
        {Opt_offusrjquota, 0, MOPT_Q},
@@ -1836,13 +1840,17 @@ static int parse_options(char *options, struct super_block *sb,
                        return 0;
        }
 #ifdef CONFIG_QUOTA
-       if (ext4_has_feature_quota(sb) &&
-           (test_opt(sb, USRQUOTA) || test_opt(sb, GRPQUOTA))) {
-               ext4_msg(sb, KERN_INFO, "Quota feature enabled, usrquota and grpquota "
-                        "mount options ignored.");
-               clear_opt(sb, USRQUOTA);
-               clear_opt(sb, GRPQUOTA);
-       } else if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {
+       /*
+        * We do the test below only for project quotas. 'usrquota' and
+        * 'grpquota' mount options are allowed even without quota feature
+        * to support legacy quotas in quota files.
+        */
+       if (test_opt(sb, PRJQUOTA) && !ext4_has_feature_project(sb)) {
+               ext4_msg(sb, KERN_ERR, "Project quota feature not enabled. "
+                        "Cannot enable project quota enforcement.");
+               return 0;
+       }
+       if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {
                if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA])
                        clear_opt(sb, USRQUOTA);
 
@@ -2741,7 +2749,6 @@ static int ext4_run_li_request(struct ext4_li_request *elr)
        sb = elr->lr_super;
        ngroups = EXT4_SB(sb)->s_groups_count;
 
-       sb_start_write(sb);
        for (group = elr->lr_next_group; group < ngroups; group++) {
                gdp = ext4_get_group_desc(sb, group, NULL);
                if (!gdp) {
@@ -2768,8 +2775,6 @@ static int ext4_run_li_request(struct ext4_li_request *elr)
                elr->lr_next_sched = jiffies + elr->lr_timeout;
                elr->lr_next_group = group + 1;
        }
-       sb_end_write(sb);
-
        return ret;
 }
 
@@ -2834,21 +2839,46 @@ cont_thread:
                        mutex_unlock(&eli->li_list_mtx);
                        goto exit_thread;
                }
-
                list_for_each_safe(pos, n, &eli->li_request_list) {
+                       int err = 0;
+                       int progress = 0;
                        elr = list_entry(pos, struct ext4_li_request,
                                         lr_request);
 
-                       if (time_after_eq(jiffies, elr->lr_next_sched)) {
-                               if (ext4_run_li_request(elr) != 0) {
-                                       /* error, remove the lazy_init job */
-                                       ext4_remove_li_request(elr);
-                                       continue;
+                       if (time_before(jiffies, elr->lr_next_sched)) {
+                               if (time_before(elr->lr_next_sched, next_wakeup))
+                                       next_wakeup = elr->lr_next_sched;
+                               continue;
+                       }
+                       if (down_read_trylock(&elr->lr_super->s_umount)) {
+                               if (sb_start_write_trylock(elr->lr_super)) {
+                                       progress = 1;
+                                       /*
+                                        * We hold sb->s_umount, sb can not
+                                        * be removed from the list, it is
+                                        * now safe to drop li_list_mtx
+                                        */
+                                       mutex_unlock(&eli->li_list_mtx);
+                                       err = ext4_run_li_request(elr);
+                                       sb_end_write(elr->lr_super);
+                                       mutex_lock(&eli->li_list_mtx);
+                                       n = pos->next;
                                }
+                               up_read((&elr->lr_super->s_umount));
+                       }
+                       /* error, remove the lazy_init job */
+                       if (err) {
+                               ext4_remove_li_request(elr);
+                               continue;
+                       }
+                       if (!progress) {
+                               elr->lr_next_sched = jiffies +
+                                       (prandom_u32()
+                                        % (EXT4_DEF_LI_MAX_START_DELAY * HZ));
+                               if (time_before(elr->lr_next_sched,
+                                               next_wakeup))
+                                       next_wakeup = elr->lr_next_sched;
                        }
-
-                       if (time_before(elr->lr_next_sched, next_wakeup))
-                               next_wakeup = elr->lr_next_sched;
                }
                mutex_unlock(&eli->li_list_mtx);
 
@@ -5250,12 +5280,18 @@ static int ext4_enable_quotas(struct super_block *sb)
                le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum),
                le32_to_cpu(EXT4_SB(sb)->s_es->s_prj_quota_inum)
        };
+       bool quota_mopt[EXT4_MAXQUOTAS] = {
+               test_opt(sb, USRQUOTA),
+               test_opt(sb, GRPQUOTA),
+               test_opt(sb, PRJQUOTA),
+       };
 
        sb_dqopt(sb)->flags |= DQUOT_QUOTA_SYS_FILE;
        for (type = 0; type < EXT4_MAXQUOTAS; type++) {
                if (qf_inums[type]) {
                        err = ext4_quota_enable(sb, type, QFMT_VFS_V1,
-                                               DQUOT_USAGE_ENABLED);
+                               DQUOT_USAGE_ENABLED |
+                               (quota_mopt[type] ? DQUOT_LIMITS_ENABLED : 0));
                        if (err) {
                                ext4_warning(sb,
                                        "Failed to enable quota tracking "