[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Tue, 11 Nov 2014 22:04:19 +0100
From: Jan Kara <jack@...e.cz>
To: linux-fsdevel@...r.kernel.org
Cc: linux-ext4@...r.kernel.org, xfs@....sgi.com,
Jan Kara <jack@...e.cz>
Subject: [PATCH 05/11] quota: Wire up ->sysquota_{on,off} callbacks into Q_QUOTA{ON,OFF}
Make Q_QUOTAON / Q_QUOTAOFF quotactl call ->sysquota_on / ->sysquota_off
callback when provided. To match current behavior of ocfs2 & ext4 we
make these quotactls turn on / off quota enforcement for appropriate
quota type.
Signed-off-by: Jan Kara <jack@...e.cz>
---
fs/quota/quota.c | 31 +++++++++++++++++++++++++++----
include/linux/quotaops.h | 2 ++
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index fb22cebff946..162d533c4997 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -63,18 +63,43 @@ static int quota_sync_all(int type)
return ret;
}
+unsigned int qtype_limit_flag(int type)
+{
+ switch (type) {
+ case USRQUOTA:
+ return FS_QUOTA_UDQ_ENFD;
+ case GRPQUOTA:
+ return FS_QUOTA_GDQ_ENFD;
+ case PRJQUOTA:
+ return FS_QUOTA_PDQ_ENFD;
+ }
+ return 0;
+}
+
static int quota_quotaon(struct super_block *sb, int type, int cmd, qid_t id,
struct path *path)
{
- if (!sb->s_qcop->quota_on && !sb->s_qcop->quota_on_meta)
+ if (!sb->s_qcop->quota_on && !sb->s_qcop->quota_on_meta &&
+ !sb->s_qcop->sysquota_on)
return -ENOSYS;
if (sb->s_qcop->quota_on_meta)
return sb->s_qcop->quota_on_meta(sb, type, id);
+ if (sb->s_qcop->sysquota_on)
+ return sb->s_qcop->sysquota_on(sb, qtype_limit_flag(type));
if (IS_ERR(path))
return PTR_ERR(path);
return sb->s_qcop->quota_on(sb, type, id, path);
}
+static int quota_quotaoff(struct super_block *sb, int type)
+{
+ if (!sb->s_qcop->quota_off && !sb->s_qcop->sysquota_off)
+ return -ENOSYS;
+ if (sb->s_qcop->sysquota_off)
+ return sb->s_qcop->sysquota_off(sb, qtype_limit_flag(type));
+ return sb->s_qcop->quota_off(sb, type);
+}
+
static int quota_getfmt(struct super_block *sb, int type, void __user *addr)
{
__u32 fmt;
@@ -319,9 +344,7 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
case Q_QUOTAON:
return quota_quotaon(sb, type, cmd, id, path);
case Q_QUOTAOFF:
- if (!sb->s_qcop->quota_off)
- return -ENOSYS;
- return sb->s_qcop->quota_off(sb, type);
+ return quota_quotaoff(sb, type);
case Q_GETFMT:
return quota_getfmt(sb, type, addr);
case Q_GETINFO:
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 1d3eee594cd6..5947a9e54862 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -386,4 +386,6 @@ static inline void dquot_release_reservation_block(struct inode *inode,
__dquot_free_space(inode, nr << inode->i_blkbits, DQUOT_SPACE_RESERVE);
}
+unsigned int qtype_limit_flag(int type);
+
#endif /* _LINUX_QUOTAOPS_ */
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists