| Message ID | 1421412471-4747-6-git-send-email-jack@suse.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 16, 2015 at 01:47:39PM +0100, Jan Kara wrote: > 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_quota_enable() checking whether usage tracking is > enabled (which can happen only if the filesystem has the quota feature > set). > > Signed-off-by: Jan Kara <jack@suse.cz> > --- > fs/ocfs2/super.c | 32 +------------------------------- > 1 file changed, 1 insertion(+), 31 deletions(-) > > diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c > index 83723179e1ec..706c71c2955d 100644 > --- a/fs/ocfs2/super.c > +++ b/fs/ocfs2/super.c > @@ -1000,36 +1000,6 @@ 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; Where are we doing this feature check now?
On Mon 19-01-15 01:03:47, Christoph Hellwig wrote: > On Fri, Jan 16, 2015 at 01:47:39PM +0100, Jan Kara wrote: > > 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_quota_enable() checking whether usage tracking is > > enabled (which can happen only if the filesystem has the quota feature > > set). > > > > Signed-off-by: Jan Kara <jack@suse.cz> > > --- > > fs/ocfs2/super.c | 32 +------------------------------- > > 1 file changed, 1 insertion(+), 31 deletions(-) > > > > diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c > > index 83723179e1ec..706c71c2955d 100644 > > --- a/fs/ocfs2/super.c > > +++ b/fs/ocfs2/super.c > > @@ -1000,36 +1000,6 @@ 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; > > Where are we doing this feature check now? So OCFS2 (similarly as ext4 or xfs) has to enable quota accounting on mount and at that point we test for the feature. Q_QUOTAON quotactl is used just to turn on enforcement and at that point it makes no sense to check for the feature (BTW, the changelog already explains this ;). Honza
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 83723179e1ec..706c71c2955d 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1000,36 +1000,6 @@ 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, - .quota_sync = dquot_quota_sync, - .get_info = dquot_get_dqinfo, - .set_info = dquot_set_dqinfo, - .get_dqblk = dquot_get_dqblk, - .set_dqblk = dquot_set_dqblk, -}; - static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) { struct dentry *root; @@ -2079,7 +2049,7 @@ static int ocfs2_initialize_super(struct super_block *sb, sb->s_op = &ocfs2_sops; sb->s_d_op = &ocfs2_dentry_ops; sb->s_export_op = &ocfs2_export_ops; - sb->s_qcop = &ocfs2_quotactl_ops; + sb->s_qcop = &dquot_quotactl_sysfile_ops; sb->dq_op = &ocfs2_quota_operations; sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP; sb->s_xattr = ocfs2_xattr_handlers;
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_quota_enable() checking whether usage tracking is enabled (which can happen only if the filesystem has the quota feature set). Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ocfs2/super.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-)