quota: Make ->set_info use structure with neccesary info to VFS and XFS (5eacb2ac) · Commits · e / devices / android_kernel_fairphone_FP5

fs/quota/dquot.c

+16 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2649,33 +2649,38 @@ int dquot_get_state(struct super_block sb, struct qc_state state)
	EXPORT_SYMBOL(dquot_get_state);		EXPORT_SYMBOL(dquot_get_state);

	/* Generic routine for setting common part of quota file information */		/* Generic routine for setting common part of quota file information */
	int dquot_set_dqinfo(struct super_block sb, int type, struct if_dqinfo ii)		int dquot_set_dqinfo(struct super_block sb, int type, struct qc_info ii)
	{		{
	struct mem_dqinfo *mi;		struct mem_dqinfo *mi;
	int err = 0;		int err = 0;

			if ((ii->i_fieldmask & QC_WARNS_MASK) \|\|
			(ii->i_fieldmask & QC_RT_SPC_TIMER))
			return -EINVAL;
	mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);		mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
	if (!sb_has_quota_active(sb, type)) {		if (!sb_has_quota_active(sb, type)) {
	err = -ESRCH;		err = -ESRCH;
	goto out;		goto out;
	}		}
	mi = sb_dqopt(sb)->info + type;		mi = sb_dqopt(sb)->info + type;
	if (ii->dqi_valid & IIF_FLAGS) {		if (ii->i_fieldmask & QC_FLAGS) {
	if (ii->dqi_flags & ~DQF_SETINFO_MASK \|\|		if ((ii->i_flags & QCI_ROOT_SQUASH &&
	(ii->dqi_flags & DQF_ROOT_SQUASH &&
	mi->dqi_format->qf_fmt_id != QFMT_VFS_OLD)) {		mi->dqi_format->qf_fmt_id != QFMT_VFS_OLD)) {
	err = -EINVAL;		err = -EINVAL;
	goto out;		goto out;
	}		}
	}		}
	spin_lock(&dq_data_lock);		spin_lock(&dq_data_lock);
	if (ii->dqi_valid & IIF_BGRACE)		if (ii->i_fieldmask & QC_SPC_TIMER)
	mi->dqi_bgrace = ii->dqi_bgrace;		mi->dqi_bgrace = ii->i_spc_timelimit;
	if (ii->dqi_valid & IIF_IGRACE)		if (ii->i_fieldmask & QC_INO_TIMER)
	mi->dqi_igrace = ii->dqi_igrace;		mi->dqi_igrace = ii->i_ino_timelimit;
	if (ii->dqi_valid & IIF_FLAGS)		if (ii->i_fieldmask & QC_FLAGS) {
	mi->dqi_flags = (mi->dqi_flags & ~DQF_SETINFO_MASK) \|		if (ii->i_flags & QCI_ROOT_SQUASH)
	(ii->dqi_flags & DQF_SETINFO_MASK);		mi->dqi_flags \|= DQF_ROOT_SQUASH;
			else
			mi->dqi_flags &= ~DQF_ROOT_SQUASH;
			}
	spin_unlock(&dq_data_lock);		spin_unlock(&dq_data_lock);
	mark_info_dirty(sb, type);		mark_info_dirty(sb, type);
	/* Force write to disk */		/* Force write to disk */

fs/quota/quota.c

+20 −1

Original line number	Original line	Diff line number	Diff line
	@@ -149,12 +149,31 @@ static int quota_getinfo(struct super_block sb, int type, void __user addr)
	static int quota_setinfo(struct super_block sb, int type, void __user addr)		static int quota_setinfo(struct super_block sb, int type, void __user addr)
	{		{
	struct if_dqinfo info;		struct if_dqinfo info;
			struct qc_info qinfo;

	if (copy_from_user(&info, addr, sizeof(info)))		if (copy_from_user(&info, addr, sizeof(info)))
	return -EFAULT;		return -EFAULT;
	if (!sb->s_qcop->set_info)		if (!sb->s_qcop->set_info)
	return -ENOSYS;		return -ENOSYS;
	return sb->s_qcop->set_info(sb, type, &info);		if (info.dqi_valid & ~(IIF_FLAGS \| IIF_BGRACE \| IIF_IGRACE))
			return -EINVAL;
			memset(&qinfo, 0, sizeof(qinfo));
			if (info.dqi_valid & IIF_FLAGS) {
			if (info.dqi_flags & ~DQF_SETINFO_MASK)
			return -EINVAL;
			if (info.dqi_flags & DQF_ROOT_SQUASH)
			qinfo.i_flags \|= QCI_ROOT_SQUASH;
			qinfo.i_fieldmask \|= QC_FLAGS;
			}
			if (info.dqi_valid & IIF_BGRACE) {
			qinfo.i_spc_timelimit = info.dqi_bgrace;
			qinfo.i_fieldmask \|= QC_SPC_TIMER;
			}
			if (info.dqi_valid & IIF_IGRACE) {
			qinfo.i_ino_timelimit = info.dqi_igrace;
			qinfo.i_fieldmask \|= QC_INO_TIMER;
			}
			return sb->s_qcop->set_info(sb, type, &qinfo);
	}		}

	static inline qsize_t qbtos(qsize_t blocks)		static inline qsize_t qbtos(qsize_t blocks)

include/linux/quota.h

+19 −2

Original line number	Original line	Diff line number	Diff line
	@@ -344,7 +344,10 @@ struct qc_dqblk {
	int d_rt_spc_warns; /* # warnings issued wrt RT space */		int d_rt_spc_warns; /* # warnings issued wrt RT space */
	};		};

	/* Field specifiers for ->set_dqblk() in struct qc_dqblk */		/*
			* Field specifiers for ->set_dqblk() in struct qc_dqblk and also for
			* ->set_info() in struct qc_info
			*/
	#define QC_INO_SOFT (1<<0)		#define QC_INO_SOFT (1<<0)
	#define QC_INO_HARD (1<<1)		#define QC_INO_HARD (1<<1)
	#define QC_SPC_SOFT (1<<2)		#define QC_SPC_SOFT (1<<2)
	@@ -365,6 +368,7 @@ struct qc_dqblk {
	#define QC_INO_COUNT (1<<13)		#define QC_INO_COUNT (1<<13)
	#define QC_RT_SPACE (1<<14)		#define QC_RT_SPACE (1<<14)
	#define QC_ACCT_MASK (QC_SPACE \| QC_INO_COUNT \| QC_RT_SPACE)		#define QC_ACCT_MASK (QC_SPACE \| QC_INO_COUNT \| QC_RT_SPACE)
			#define QC_FLAGS (1<<15)

	#define QCI_SYSFILE (1 << 0) /* Quota file is hidden from userspace */		#define QCI_SYSFILE (1 << 0) /* Quota file is hidden from userspace */
	#define QCI_ROOT_SQUASH (1 << 1) /* Root squash turned on */		#define QCI_ROOT_SQUASH (1 << 1) /* Root squash turned on */
	@@ -397,6 +401,19 @@ struct qc_state {
	struct qc_type_state s_state[XQM_MAXQUOTAS];		struct qc_type_state s_state[XQM_MAXQUOTAS];
	};		};

			/* Structure for communicating via ->set_info */
			struct qc_info {
			int i_fieldmask; /* mask of fields to change in ->set_info() */
			unsigned int i_flags; /* Flags QCI_* */
			unsigned int i_spc_timelimit; /* Time after which space softlimit is
			* enforced */
			unsigned int i_ino_timelimit; /* Ditto for inode softlimit */
			unsigned int i_rt_spc_timelimit;/* Ditto for real-time space */
			unsigned int i_spc_warnlimit; /* Limit for number of space warnings */
			unsigned int i_ino_warnlimit; /* Limit for number of inode warnings */
			unsigned int i_rt_spc_warnlimit; /* Ditto for real-time space */
			};

	/* Operations handling requests from userspace */		/* Operations handling requests from userspace */
	struct quotactl_ops {		struct quotactl_ops {
	int (quota_on)(struct super_block , int, int, struct path *);		int (quota_on)(struct super_block , int, int, struct path *);
	@@ -404,7 +421,7 @@ struct quotactl_ops {
	int (quota_enable)(struct super_block , unsigned int);		int (quota_enable)(struct super_block , unsigned int);
	int (quota_disable)(struct super_block , unsigned int);		int (quota_disable)(struct super_block , unsigned int);
	int (quota_sync)(struct super_block , int);		int (quota_sync)(struct super_block , int);
	int (set_info)(struct super_block , int, struct if_dqinfo *);		int (set_info)(struct super_block , int, struct qc_info *);
	int (get_dqblk)(struct super_block , struct kqid, struct qc_dqblk *);		int (get_dqblk)(struct super_block , struct kqid, struct qc_dqblk *);
	int (set_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_state)(struct super_block , struct qc_state *);

include/linux/quotaops.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -96,7 +96,7 @@ int dquot_quota_off(struct super_block *sb, int type);
	int dquot_writeback_dquots(struct super_block *sb, int type);		int dquot_writeback_dquots(struct super_block *sb, int type);
	int dquot_quota_sync(struct super_block *sb, int type);		int dquot_quota_sync(struct super_block *sb, int type);
	int dquot_get_state(struct super_block sb, struct qc_state state);		int dquot_get_state(struct super_block sb, struct qc_state state);
	int dquot_set_dqinfo(struct super_block sb, int type, struct if_dqinfo ii);		int dquot_set_dqinfo(struct super_block sb, int type, struct qc_info ii);
	int dquot_get_dqblk(struct super_block *sb, struct kqid id,		int dquot_get_dqblk(struct super_block *sb, struct kqid id,
	struct qc_dqblk *di);		struct qc_dqblk *di);
	int dquot_set_dqblk(struct super_block *sb, struct kqid id,		int dquot_set_dqblk(struct super_block *sb, struct kqid id,