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

Commit 59b6ba69 authored by Jan Kara's avatar Jan Kara
Browse files

quota: Remove ->get_xstate and ->get_xstatev callbacks 



These callbacks are now unused. Remove them.

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

fs/quota/quota.c

+4 −10
Original line number Diff line number Diff line
@@ -350,12 +350,9 @@ static int quota_getxstate(struct super_block *sb, void __user *addr) 
	struct fs_quota_stat fqs;

	int ret;



	if (!sb->s_qcop->get_xstate && !sb->s_qcop->get_state)

	if (!sb->s_qcop->get_state)

		return -ENOSYS;

	if (sb->s_qcop->get_state)

	ret = quota_getstate(sb, &fqs);

	else

		ret = sb->s_qcop->get_xstate(sb, &fqs);

	if (!ret && copy_to_user(addr, &fqs, sizeof(fqs)))

		return -EFAULT;

	return ret;
@@ -414,7 +411,7 @@ static int quota_getxstatev(struct super_block *sb, void __user *addr) 
	struct fs_quota_statv fqs;

	int ret;



	if (!sb->s_qcop->get_xstatev && !sb->s_qcop->get_state)

	if (!sb->s_qcop->get_state)

		return -ENOSYS;



	memset(&fqs, 0, sizeof(fqs));
@@ -428,10 +425,7 @@ static int quota_getxstatev(struct super_block *sb, void __user *addr) 
	default:

		return -EINVAL;

	}

	if (sb->s_qcop->get_state)

	ret = quota_getstatev(sb, &fqs);

	else

		ret = sb->s_qcop->get_xstatev(sb, &fqs);

	if (!ret && copy_to_user(addr, &fqs, sizeof(fqs)))

		return -EFAULT;

	return ret;

include/linux/quota.h

+0 −2
Original line number Diff line number Diff line
@@ -408,8 +408,6 @@ struct quotactl_ops { 
	int (*get_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);

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

	int (*get_state)(struct super_block *, struct qc_state *);

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

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

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

};