From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: xfs@oss.sgi.com, cluster-devel@redhat.com,
Steven Whitehouse <swhiteho@redhat.com>, Jan Kara <jack@suse.cz>
Subject: [PATCH 8/8] quota: Hook up Q_XSETQLIM for id 0 to ->set_info
Date: Wed, 18 Feb 2015 14:47:54 +0100 [thread overview]
Message-ID: <1424267274-11836-9-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1424267274-11836-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 741d5a178268..86ded7375c21 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -517,6 +517,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)
{
@@ -531,6 +555,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);
}
--
2.1.4
next prev parent reply other threads:[~2015-02-18 13:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-18 13:47 [PATCH 0/8 v5] quota: Unify VFS and XFS quota interfaces Jan Kara
2015-02-18 13:47 ` [PATCH 1/8] quota: Make VFS quotas use new interface for getting quota info Jan Kara
2015-02-18 13:47 ` [PATCH 2/8] quota: Wire up Q_GETXSTATE and Q_GETXSTATV calls to work with ->get_state Jan Kara
2015-02-18 13:47 ` [PATCH 3/8] xfs: Convert to using ->get_state callback Jan Kara
2015-02-18 16:51 ` [Cluster-devel] " Christoph Hellwig
2015-02-18 17:11 ` Jan Kara
2015-02-18 13:47 ` [PATCH 4/8] gfs2: " Jan Kara
2015-02-18 13:55 ` [Cluster-devel] " Bob Peterson
2015-02-18 13:47 ` [PATCH 5/8] quota: Remove ->get_xstate and ->get_xstatev callbacks Jan Kara
2015-02-18 13:47 ` [PATCH 6/8] quota: Make ->set_info use structure with neccesary info to VFS and XFS Jan Kara
2015-02-18 16:53 ` [Cluster-devel] " Christoph Hellwig
2015-02-18 17:17 ` Jan Kara
2015-02-18 13:47 ` [PATCH 7/8] xfs: Add support for Q_SETINFO Jan Kara
2015-02-18 16:54 ` [Cluster-devel] " Christoph Hellwig
2015-02-18 17:20 ` Jan Kara
2015-02-18 13:47 ` Jan Kara [this message]
2015-02-18 16:54 ` [Cluster-devel] [PATCH 8/8] quota: Hook up Q_XSETQLIM for id 0 to ->set_info Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2015-03-04 15:15 [PATCH 0/8 v6] quota: Unify VFS and XFS quota interfaces Jan Kara
2015-03-04 15:15 ` [PATCH 8/8] quota: Hook up Q_XSETQLIM for id 0 to ->set_info Jan Kara
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=1424267274-11836-9-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
--cc=cluster-devel@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=swhiteho@redhat.com \
--cc=xfs@oss.sgi.com \
/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).