From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: xfs@oss.sgi.com, cluster-devel@redhat.com,
ocfs2-devel@oss.oracle.com, Jan Kara <jack@suse.cz>
Subject: [PATCH 16/17] xfs: Add support for Q_SETINFO
Date: Fri, 16 Jan 2015 13:47:50 +0100 [thread overview]
Message-ID: <1421412471-4747-17-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1421412471-4747-1-git-send-email-jack@suse.cz>
Add support to XFS so that time limits can be set through Q_SETINFO
quotactl.
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/xfs/xfs_qm.h | 2 ++
fs/xfs/xfs_qm_syscalls.c | 25 +++++++++++++++++++++++++
fs/xfs/xfs_quotaops.c | 16 ++++++++++++++++
3 files changed, 43 insertions(+)
diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
index d308e9610548..c1a9761d37db 100644
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@ -170,6 +170,8 @@ extern int xfs_qm_scall_setqlim(struct xfs_mount *, xfs_dqid_t, uint,
struct qc_dqblk *);
extern int xfs_qm_scall_getstate(struct xfs_mount *,
struct qc_state *);
+extern int xfs_qm_scall_setinfo(struct xfs_mount *, uint,
+ struct qc_info *);
extern int xfs_qm_scall_quotaon(struct xfs_mount *, uint);
extern int xfs_qm_scall_quotaoff(struct xfs_mount *, uint);
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 5ccafb4c7e79..9ede1ffec8d8 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -451,6 +451,31 @@ int xfs_qm_scall_getstate(struct xfs_mount *mp, struct qc_state *state)
return 0;
}
+#define XFS_QC_SETINFO_MASK (QC_TIMER_MASK | QC_WARNS_MASK)
+
+/*
+ * Adjust quota timers & warnings
+ */
+int xfs_qm_scall_setinfo(struct xfs_mount *mp, uint type, struct qc_info *info)
+{
+ struct qc_dqblk newlim;
+
+ if (info->i_fieldmask & ~XFS_QC_SETINFO_MASK)
+ return -EINVAL;
+ if ((info->i_fieldmask & XFS_QC_SETINFO_MASK) == 0)
+ return 0;
+
+ newlim.d_fieldmask = info->i_fieldmask;
+ newlim.d_spc_timer = info->i_spc_timelimit;
+ newlim.d_ino_timer = info->i_ino_timelimit;
+ newlim.d_rt_spc_timer = info->i_rt_spc_timelimit;
+ newlim.d_ino_warns = info->i_ino_warnlimit;
+ newlim.d_spc_warns = info->i_spc_warnlimit;
+ newlim.d_rt_spc_warns = info->i_rt_spc_warnlimit;
+
+ return xfs_qm_scall_setqlim(mp, 0, type, &newlim);
+}
+
#define XFS_QC_MASK \
(QC_LIMIT_MASK | QC_TIMER_MASK | QC_WARNS_MASK)
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index 698e6faac519..a25f482955a7 100644
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -45,6 +45,21 @@ static int xfs_fs_get_quota_state(struct super_block *sb, struct qc_state *s)
return xfs_qm_scall_getstate(XFS_M(sb), s);
}
+static int xfs_fs_set_info(struct super_block *sb, int type,
+ struct qc_info *info)
+{
+ struct xfs_mount *mp = XFS_M(sb);
+
+ if (sb->s_flags & MS_RDONLY)
+ return -EROFS;
+ if (!XFS_IS_QUOTA_RUNNING(mp))
+ return -ENOSYS;
+ if (!XFS_IS_QUOTA_ON(mp))
+ return -ESRCH;
+
+ return xfs_qm_scall_setinfo(mp, xfs_quota_type(type), info);
+}
+
static unsigned int xfs_quota_flags(unsigned int uflags)
{
unsigned int flags = 0;
@@ -159,6 +174,7 @@ xfs_fs_set_dqblk(
const struct quotactl_ops xfs_quotactl_operations = {
.get_state = xfs_fs_get_quota_state,
+ .set_info = xfs_fs_set_info,
.quota_enable = xfs_quota_enable,
.quota_disable = xfs_quota_disable,
.rm_xquota = xfs_fs_rm_xquota,
--
2.1.2
next prev parent reply other threads:[~2015-01-16 12:48 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-16 12:47 [PATCH 0/17 v3] quota: Unify VFS and XFS quota interfaces Jan Kara
2015-01-16 12:47 ` [PATCH 01/17] quota: Split ->set_xstate callback into two Jan Kara
2015-01-19 9:00 ` Christoph Hellwig
2015-01-16 12:47 ` [PATCH 02/17] quota: Wire up ->quota_{enable,disable} callbacks into Q_QUOTA{ON,OFF} Jan Kara
2015-01-19 9:01 ` Christoph Hellwig
2015-01-20 17:01 ` Jan Kara
2015-01-16 12:47 ` [PATCH 03/17] quota: Add ->quota_{enable, disable} callbacks for VFS quotas Jan Kara
2015-01-19 9:02 ` [PATCH 03/17] quota: Add ->quota_{enable,disable} " Christoph Hellwig
2015-01-20 17:08 ` Jan Kara
2015-01-16 12:47 ` [PATCH 04/17] ext4: Use generic helpers for quotaon and quotaoff Jan Kara
2015-01-19 9:03 ` Christoph Hellwig
2015-01-16 12:47 ` [PATCH 05/17] ocfs2: " Jan Kara
2015-01-19 9:03 ` Christoph Hellwig
2015-01-20 17:13 ` Jan Kara
2015-01-16 12:47 ` [PATCH 06/17] quota: Remove quota_on_meta callback Jan Kara
2015-01-19 9:04 ` Christoph Hellwig
2015-01-16 12:47 ` [PATCH 07/17] quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units Jan Kara
2015-01-19 9:07 ` Christoph Hellwig
2015-01-20 16:53 ` Jan Kara
2015-01-16 12:47 ` [PATCH 08/17] quota: Store maximum space limit in bytes Jan Kara
2015-01-19 9:07 ` Christoph Hellwig
2015-01-16 12:47 ` [PATCH 09/17] quota: Make Q_XQUOTASYNC support VFS quota syncing Jan Kara
2015-01-19 9:09 ` Christoph Hellwig
2015-01-20 17:16 ` Jan Kara
2015-01-16 12:47 ` [PATCH 10/17] quota: Make VFS quotas use new interface for getting quota info Jan Kara
2015-01-19 9:10 ` Christoph Hellwig
2015-01-16 12:47 ` [PATCH 11/17] quota: Wire up Q_GETXSTATE and Q_GETXSTATV calls to work with ->get_state Jan Kara
2015-01-19 9:11 ` Christoph Hellwig
2015-01-16 12:47 ` [PATCH 12/17] xfs: Convert to using ->get_state callback Jan Kara
2015-01-19 9:38 ` Christoph Hellwig
2015-01-20 17:33 ` Jan Kara
2015-01-16 12:47 ` [PATCH 13/17] gfs2: " Jan Kara
2015-01-16 12:47 ` [PATCH 14/17] quota: Remove ->get_xstate and ->get_xstatev callbacks Jan Kara
2015-01-19 9:38 ` Christoph Hellwig
2015-01-16 12:47 ` [PATCH 15/17] quota: Make ->set_info use structure with neccesary info to VFS and XFS Jan Kara
2015-01-16 12:47 ` Jan Kara [this message]
2015-01-16 12:47 ` [PATCH 17/17] quota: Hook up Q_XSETQLIM for id 0 to ->set_info Jan Kara
2015-01-21 21:38 ` [PATCH 0/17 v3] quota: Unify VFS and XFS quota interfaces Dave Chinner
2015-01-21 22:23 ` Jan Kara
2015-01-21 23:10 ` Dave Chinner
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=1421412471-4747-17-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
--cc=cluster-devel@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.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).