From: Jan Kara <jack@suse.cz>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 25/25] quota: Hook up Q_XSETQLIM for id 0 to ->set_info
Date: Thu, 18 Dec 2014 16:37:39 +0100 [thread overview]
Message-ID: <1418917059-23870-26-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1418917059-23870-1-git-send-email-jack@suse.cz>
Setting timers or warning counts for id 0 via Q_XSETQLIM is used to
actually set time limits and warning limits for all users. Hook up
->set_info to this so that VFS quota time limits get set the same
way as XFS ones.
When doing this Q_XSETQLIM for XFS is effectively split into two
independent transactions - one for setting timers and warning limits and
one for setting space and inode limits. Although this is inefficient, it
is rare enough that it does not matter.
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/quota/quota.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index f39bf4725184..813cb94fc81d 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -500,6 +500,30 @@ static void copy_from_xfs_dqblk(struct qc_dqblk *dst, struct fs_disk_quota *src)
dst->d_fieldmask |= QC_RT_SPACE;
}
+static void copy_qcinfo_from_xfs_dqblk(struct qc_info *dst,
+ struct fs_disk_quota *src)
+{
+ memset(dst, 0, sizeof(*dst));
+ dst->i_spc_timelimit = src->d_btimer;
+ dst->i_ino_timelimit = src->d_itimer;
+ dst->i_rt_spc_timelimit = src->d_rtbtimer;
+ dst->i_ino_warnlimit = src->d_iwarns;
+ dst->i_spc_warnlimit = src->d_bwarns;
+ dst->i_rt_spc_warnlimit = src->d_rtbwarns;
+ if (src->d_fieldmask & FS_DQ_BWARNS)
+ dst->i_fieldmask |= QC_SPC_WARNS;
+ if (src->d_fieldmask & FS_DQ_IWARNS)
+ dst->i_fieldmask |= QC_INO_WARNS;
+ if (src->d_fieldmask & FS_DQ_RTBWARNS)
+ dst->i_fieldmask |= QC_RT_SPC_WARNS;
+ if (src->d_fieldmask & FS_DQ_BTIMER)
+ dst->i_fieldmask |= QC_SPC_TIMER;
+ if (src->d_fieldmask & FS_DQ_ITIMER)
+ dst->i_fieldmask |= QC_INO_TIMER;
+ if (src->d_fieldmask & FS_DQ_RTBTIMER)
+ dst->i_fieldmask |= QC_RT_SPC_TIMER;
+}
+
static int quota_setxquota(struct super_block *sb, int type, qid_t id,
void __user *addr)
{
@@ -514,6 +538,21 @@ static int quota_setxquota(struct super_block *sb, int type, qid_t id,
qid = make_kqid(current_user_ns(), type, id);
if (!qid_valid(qid))
return -EINVAL;
+ /* Are we actually setting timer / warning limits for all users? */
+ if (from_kqid(&init_user_ns, qid) == 0 &&
+ fdq.d_fieldmask & (FS_DQ_WARNS_MASK | FS_DQ_TIMER_MASK)) {
+ struct qc_info qinfo;
+ int ret;
+
+ if (!sb->s_qcop->set_info)
+ return -EINVAL;
+ copy_qcinfo_from_xfs_dqblk(&qinfo, &fdq);
+ ret = sb->s_qcop->set_info(sb, type, &qinfo);
+ if (ret)
+ return ret;
+ /* These are already done */
+ fdq.d_fieldmask &= ~(FS_DQ_WARNS_MASK | FS_DQ_TIMER_MASK);
+ }
copy_from_xfs_dqblk(&qdq, &fdq);
return sb->s_qcop->set_dqblk(sb, qid, &qdq);
}
--
1.8.4.5
prev parent reply other threads:[~2014-12-18 15:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-18 15:37 [Cluster-devel] [PATCH 0/25 RFC v2] quota: Unify VFS and XFS quota interfaces Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 01/25] xfs: Remove useless test Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 02/25] xfs: Remove unused variable in xfs_qm_scall_quotaon() Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 03/25] xfs: Remove some useless flags tests Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 04/25] quota: Split ->set_xstate callback into two Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 05/25] quota: Wire up ->quota_{enable, disable} callbacks into Q_QUOTA{ON, OFF} Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 06/25] quota: Add ->quota_{enable, disable} callbacks for VFS quotas Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 07/25] ext4: Use generic helpers for quotaon and quotaoff Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 08/25] ocfs2: " Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 09/25] quota: Remove quota_on_meta callback Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 10/25] quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 11/25] quota: Store maximum space limit in bytes Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 12/25] quota: Make Q_XQUOTASYNC support VFS quota syncing Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 13/25] quota: Don't store flags for v2 quota format Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 14/25] ocfs2: Move OLQF_CLEAN flag out of generic quota flags Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 15/25] quota: Cleanup flags definitions Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 16/25] quota: Verify flags passed to Q_SETINFO Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 17/25] quota: Make VFS quotas use new interface for getting quota info Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 18/25] quota: Wire up Q_GETXSTATE and Q_GETXSTATV calls to work with ->get_state Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 19/25] xfs: Remove some pointless quota checks Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 20/25] xfs: Convert to using ->get_state callback Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 21/25] gfs2: " Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 22/25] quota: Remove ->get_xstate and ->get_xstatev callbacks Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 23/25] quota: Make ->set_info use structure with neccesary info to VFS and XFS Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 24/25] xfs: Add support for Q_SETINFO Jan Kara
2014-12-18 15:37 ` Jan Kara [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418917059-23870-26-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).