xfs
[Top] [All Lists]

[PATCH 08/11] ocfs2: Use generic helpers for quotaon and quotaoff

To: linux-fsdevel@xxxxxxxxxxxxxxx
Subject: [PATCH 08/11] ocfs2: Use generic helpers for quotaon and quotaoff
From: Jan Kara <jack@xxxxxxx>
Date: Tue, 11 Nov 2014 22:04:22 +0100
Cc: linux-ext4@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx, Jan Kara <jack@xxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1415739865-2438-1-git-send-email-jack@xxxxxxx>
References: <1415739865-2438-1-git-send-email-jack@xxxxxxx>
Ocfs2 can just use the generic helpers provided by quota code for turning
quotas on and off when quota files are stored as system inodes. The only
difference is the feature test in ocfs2_quota_on() and that is covered
by dquot_sysquota_on() checking whether usage tracking is enabled (which
can happen only if the filesystem has the quota feature set).

Signed-off-by: Jan Kara <jack@xxxxxxx>
---
 fs/ocfs2/super.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 93c85bc745e1..1cfedaa24a9d 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -993,29 +993,9 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb)
        }
 }
 
-/* Handle quota on quotactl */
-static int ocfs2_quota_on(struct super_block *sb, int type, int format_id)
-{
-       unsigned int feature[OCFS2_MAXQUOTAS] = {
-                                       OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
-                                       OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
-
-       if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))
-               return -EINVAL;
-
-       return dquot_enable(sb_dqopt(sb)->files[type], type,
-                           format_id, DQUOT_LIMITS_ENABLED);
-}
-
-/* Handle quota off quotactl */
-static int ocfs2_quota_off(struct super_block *sb, int type)
-{
-       return dquot_disable(sb, type, DQUOT_LIMITS_ENABLED);
-}
-
 static const struct quotactl_ops ocfs2_quotactl_ops = {
-       .quota_on_meta  = ocfs2_quota_on,
-       .quota_off      = ocfs2_quota_off,
+       .sysquota_on    = dquot_sysquota_on,
+       .sysquota_off   = dquot_sysquota_off,
        .quota_sync     = dquot_quota_sync,
        .get_info       = dquot_get_dqinfo,
        .set_info       = dquot_set_dqinfo,
-- 
1.8.1.4

<Prev in Thread] Current Thread [Next in Thread>