diff mbox

[07/11] ext4: Use generic helpers for quotaon and quotaoff

Message ID 1415739865-2438-8-git-send-email-jack@suse.cz
State Not Applicable, archived
Headers show

Commit Message

Jan Kara Nov. 11, 2014, 9:04 p.m. UTC 
Ext4 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 ext4_quota_on_sysfile() but the same
is achieved in dquot_sysquota_on() by checking whether usage tracking for
the corresponding quota type is enabled (which can happen only if quota
feature is set).

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/ext4/super.c | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

Comments

Christoph Hellwig Nov. 13, 2014, 5:36 p.m. UTC | #1 
>  static const struct quotactl_ops ext4_qctl_sysfile_operations = {
> -	.quota_on_meta	= ext4_quota_on_sysfile,
> -	.quota_off	= ext4_quota_off_sysfile,
> +	.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,

This vector now only has generic dquot_ methods.  Maybe move the
vector to fs/quota/dquot.c and allow multiple filesystems to share it?
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jan Kara Nov. 18, 2014, 4:07 p.m. UTC | #2 
On Thu 13-11-14 09:36:00, Christoph Hellwig wrote:
> >  static const struct quotactl_ops ext4_qctl_sysfile_operations = {
> > -	.quota_on_meta	= ext4_quota_on_sysfile,
> > -	.quota_off	= ext4_quota_off_sysfile,
> > +	.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,
> 
> This vector now only has generic dquot_ methods.  Maybe move the
> vector to fs/quota/dquot.c and allow multiple filesystems to share it?
  Right. ocfs2 actually has the same vector now. I'll unify it.

								Honza
diff mbox

Patch

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 2c9e6864abd9..45be29119e42 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1055,10 +1055,7 @@  static int ext4_mark_dquot_dirty(struct dquot *dquot);
 static int ext4_write_info(struct super_block *sb, int type);
 static int ext4_quota_on(struct super_block *sb, int type, int format_id,
 			 struct path *path);
-static int ext4_quota_on_sysfile(struct super_block *sb, int type,
-				 int format_id);
 static int ext4_quota_off(struct super_block *sb, int type);
-static int ext4_quota_off_sysfile(struct super_block *sb, int type);
 static int ext4_quota_on_mount(struct super_block *sb, int type);
 static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,
 			       size_t len, loff_t off);
@@ -1090,8 +1087,8 @@  static const struct quotactl_ops ext4_qctl_operations = {
 };
 
 static const struct quotactl_ops ext4_qctl_sysfile_operations = {
-	.quota_on_meta	= ext4_quota_on_sysfile,
-	.quota_off	= ext4_quota_off_sysfile,
+	.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,
@@ -5273,21 +5270,6 @@  static int ext4_enable_quotas(struct super_block *sb)
 	return 0;
 }
 
-/*
- * quota_on function that is used when QUOTA feature is set.
- */
-static int ext4_quota_on_sysfile(struct super_block *sb, int type,
-				 int format_id)
-{
-	if (!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA))
-		return -EINVAL;
-
-	/*
-	 * USAGE was enabled at mount time. Only need to enable LIMITS now.
-	 */
-	return ext4_quota_enable(sb, type, format_id, DQUOT_LIMITS_ENABLED);
-}
-
 static int ext4_quota_off(struct super_block *sb, int type)
 {
 	struct inode *inode = sb_dqopt(sb)->files[type];
@@ -5314,18 +5296,6 @@  out:
 	return dquot_quota_off(sb, type);
 }
 
-/*
- * quota_off function that is used when QUOTA feature is set.
- */
-static int ext4_quota_off_sysfile(struct super_block *sb, int type)
-{
-	if (!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA))
-		return -EINVAL;
-
-	/* Disable only the limits. */
-	return dquot_disable(sb, type, DQUOT_LIMITS_ENABLED);
-}
-
 /* Read data from quotafile - avoid pagecache and such because we cannot afford
  * acquiring the locks... As quota files are never truncated and quota code
  * itself serializes the operations (and no one else should touch the files)