Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38e478c4 authored by Jan Kara's avatar Jan Kara
Browse files

quota: Split ->set_xstate callback into two 



Split ->set_xstate callback into two callbacks - one for turning quotas
on (->quota_enable) and one for turning quotas off (->quota_disable). That
way we don't have to pass quotactl command into the callback which seems
cleaner.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 1cd6b7be

fs/quota/quota.c

+16 −4
Original line number Diff line number Diff line
@@ -208,15 +208,26 @@ static int quota_setquota(struct super_block *sb, int type, qid_t id, 
	return sb->s_qcop->set_dqblk(sb, qid, &fdq);

}



static int quota_setxstate(struct super_block *sb, int cmd, void __user *addr)

static int quota_enable(struct super_block *sb, void __user *addr)

{

	__u32 flags;



	if (copy_from_user(&flags, addr, sizeof(flags)))

		return -EFAULT;

	if (!sb->s_qcop->set_xstate)

	if (!sb->s_qcop->quota_enable)

		return -ENOSYS;

	return sb->s_qcop->set_xstate(sb, flags, cmd);

	return sb->s_qcop->quota_enable(sb, flags);

}



static int quota_disable(struct super_block *sb, void __user *addr)

{

	__u32 flags;



	if (copy_from_user(&flags, addr, sizeof(flags)))

		return -EFAULT;

	if (!sb->s_qcop->quota_disable)

		return -ENOSYS;

	return sb->s_qcop->quota_disable(sb, flags);

}



static int quota_getxstate(struct super_block *sb, void __user *addr)
@@ -447,8 +458,9 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id, 
			return -ENOSYS;

		return sb->s_qcop->quota_sync(sb, type);

	case Q_XQUOTAON:

		return quota_enable(sb, addr);

	case Q_XQUOTAOFF:

		return quota_setxstate(sb, cmd, addr);

		return quota_disable(sb, addr);

	case Q_XQUOTARM:

		return quota_rmxquota(sb, addr);

	case Q_XGETQSTAT:

fs/xfs/xfs_quotaops.c

+37 −22
Original line number Diff line number Diff line
@@ -64,20 +64,11 @@ xfs_fs_get_xstatev( 
	return xfs_qm_scall_getqstatv(mp, fqs);

}



STATIC int

xfs_fs_set_xstate(

	struct super_block	*sb,

	unsigned int		uflags,

	int			op)

static unsigned int

xfs_quota_flags(unsigned int uflags)

{

	struct xfs_mount	*mp = XFS_M(sb);

	unsigned int flags = 0;



	if (sb->s_flags & MS_RDONLY)

		return -EROFS;

	if (!XFS_IS_QUOTA_RUNNING(mp))

		return -ENOSYS;



	if (uflags & FS_QUOTA_UDQ_ACCT)

		flags |= XFS_UQUOTA_ACCT;

	if (uflags & FS_QUOTA_PDQ_ACCT)
@@ -91,16 +82,39 @@ xfs_fs_set_xstate( 
	if (uflags & FS_QUOTA_PDQ_ENFD)

		flags |= XFS_PQUOTA_ENFD;



	switch (op) {

	case Q_XQUOTAON:

		return xfs_qm_scall_quotaon(mp, flags);

	case Q_XQUOTAOFF:

		if (!XFS_IS_QUOTA_ON(mp))

			return -EINVAL;

		return xfs_qm_scall_quotaoff(mp, flags);

	return flags;

}



STATIC int

xfs_quota_enable(

	struct super_block	*sb,

	unsigned int		uflags)

{

	struct xfs_mount	*mp = XFS_M(sb);



	if (sb->s_flags & MS_RDONLY)

		return -EROFS;

	if (!XFS_IS_QUOTA_RUNNING(mp))

		return -ENOSYS;



	return xfs_qm_scall_quotaon(mp, xfs_quota_flags(uflags));

}



STATIC int

xfs_quota_disable(

	struct super_block	*sb,

	unsigned int		uflags)

{

	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 -EINVAL;



	return xfs_qm_scall_quotaoff(mp, xfs_quota_flags(uflags));

}



STATIC int
@@ -166,7 +180,8 @@ xfs_fs_set_dqblk( 
const struct quotactl_ops xfs_quotactl_operations = {

	.get_xstatev		= xfs_fs_get_xstatev,

	.get_xstate		= xfs_fs_get_xstate,

	.set_xstate		= xfs_fs_set_xstate,

	.quota_enable		= xfs_quota_enable,

	.quota_disable		= xfs_quota_disable,

	.rm_xquota		= xfs_fs_rm_xquota,

	.get_dqblk		= xfs_fs_get_dqblk,

	.set_dqblk		= xfs_fs_set_dqblk,

include/linux/quota.h

+2 −1
Original line number Diff line number Diff line
@@ -371,13 +371,14 @@ struct quotactl_ops { 
	int (*quota_on)(struct super_block *, int, int, struct path *);

	int (*quota_on_meta)(struct super_block *, int, int);

	int (*quota_off)(struct super_block *, int);

	int (*quota_enable)(struct super_block *, unsigned int);

	int (*quota_disable)(struct super_block *, unsigned int);

	int (*quota_sync)(struct super_block *, int);

	int (*get_info)(struct super_block *, int, struct if_dqinfo *);

	int (*set_info)(struct super_block *, int, struct if_dqinfo *);

	int (*get_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);

	int (*set_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);

	int (*get_xstate)(struct super_block *, struct fs_quota_stat *);

	int (*set_xstate)(struct super_block *, unsigned int, int);

	int (*get_xstatev)(struct super_block *, struct fs_quota_statv *);

	int (*rm_xquota)(struct super_block *, unsigned int);

};