quota: Make ->set_info use structure with neccesary info to VFS and XFS

Change ->set_info to take new qc_info structure which contains all the
necessary information both for XFS and VFS. Convert Q_SETINFO handler
to use this structure.

Signed-off-by: Jan Kara <jack@suse.cz>

2 files changed, 36 insertions, 12 deletions

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index cf4edd87e854..f37b74eab807 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2649,33 +2649,38 @@ int dquot_get_state(struct super_block *sb, struct qc_state *state)
 EXPORT_SYMBOL(dquot_get_state);
 
 /* Generic routine for setting common part of quota file information */
-int dquot_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
+int dquot_set_dqinfo(struct super_block *sb, int type, struct qc_info *ii)
 {
         struct mem_dqinfo *mi;
         int err = 0;
 
+        if ((ii->i_fieldmask & QC_WARNS_MASK) ||
+            (ii->i_fieldmask & QC_RT_SPC_TIMER))
+                return -EINVAL;
         mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
         if (!sb_has_quota_active(sb, type)) {
                 err = -ESRCH;
                 goto out;
         }
         mi = sb_dqopt(sb)->info + type;
-        if (ii->dqi_valid & IIF_FLAGS) {
-                if (ii->dqi_flags & ~DQF_SETINFO_MASK ||
-                    (ii->dqi_flags & DQF_ROOT_SQUASH &&
+        if (ii->i_fieldmask & QC_FLAGS) {
+                if ((ii->i_flags & QCI_ROOT_SQUASH &&
                      mi->dqi_format->qf_fmt_id != QFMT_VFS_OLD)) {
                         err = -EINVAL;
                         goto out;
                 }
         }
         spin_lock(&dq_data_lock);
-        if (ii->dqi_valid & IIF_BGRACE)
-                mi->dqi_bgrace = ii->dqi_bgrace;
-        if (ii->dqi_valid & IIF_IGRACE)
-                mi->dqi_igrace = ii->dqi_igrace;
-        if (ii->dqi_valid & IIF_FLAGS)
-                mi->dqi_flags = (mi->dqi_flags & ~DQF_SETINFO_MASK) |
-                                (ii->dqi_flags & DQF_SETINFO_MASK);
+        if (ii->i_fieldmask & QC_SPC_TIMER)
+                mi->dqi_bgrace = ii->i_spc_timelimit;
+        if (ii->i_fieldmask & QC_INO_TIMER)
+                mi->dqi_igrace = ii->i_ino_timelimit;
+        if (ii->i_fieldmask & QC_FLAGS) {
+                if (ii->i_flags & QCI_ROOT_SQUASH)
+                        mi->dqi_flags |= DQF_ROOT_SQUASH;
+                else
+                        mi->dqi_flags &= ~DQF_ROOT_SQUASH;
+        }
         spin_unlock(&dq_data_lock);
         mark_info_dirty(sb, type);
         /* Force write to disk */
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index 20d11cd21247..741d5a178268 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -149,12 +149,31 @@ static int quota_getinfo(struct super_block *sb, int type, void __user *addr)
 static int quota_setinfo(struct super_block *sb, int type, void __user *addr)
 {
         struct if_dqinfo info;
+        struct qc_info qinfo;
 
         if (copy_from_user(&info, addr, sizeof(info)))
                 return -EFAULT;
         if (!sb->s_qcop->set_info)
                 return -ENOSYS;
-        return sb->s_qcop->set_info(sb, type, &info);
+        if (info.dqi_valid & ~(IIF_FLAGS | IIF_BGRACE | IIF_IGRACE))
+                return -EINVAL;
+        memset(&qinfo, 0, sizeof(qinfo));
+        if (info.dqi_valid & IIF_FLAGS) {
+                if (info.dqi_flags & ~DQF_SETINFO_MASK)
+                        return -EINVAL;
+                if (info.dqi_flags & DQF_ROOT_SQUASH)
+                        qinfo.i_flags |= QCI_ROOT_SQUASH;
+                qinfo.i_fieldmask |= QC_FLAGS;
+        }
+        if (info.dqi_valid & IIF_BGRACE) {
+                qinfo.i_spc_timelimit = info.dqi_bgrace;
+                qinfo.i_fieldmask |= QC_SPC_TIMER;
+        }
+        if (info.dqi_valid & IIF_IGRACE) {
+                qinfo.i_ino_timelimit = info.dqi_igrace;
+                qinfo.i_fieldmask |= QC_INO_TIMER;
+        }
+        return sb->s_qcop->set_info(sb, type, &qinfo);
 }
 
 static inline qsize_t qbtos(qsize_t blocks)