xfs: merge xfs_qm_export_dquot into xfs_qm_scall_getquota
The is no good reason to have these two separate, and for the next change we would need the full struct xfs_dquot in xfs_qm_export_dquot, so better just fold the code now instead of changing it spuriously. Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
parent
ad637a10f4
commit
18535a7e01
|
@ -47,9 +47,6 @@ STATIC int xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *,
|
|||
uint);
|
||||
STATIC uint xfs_qm_export_flags(uint);
|
||||
STATIC uint xfs_qm_export_qtype_flags(uint);
|
||||
STATIC void xfs_qm_export_dquot(xfs_mount_t *, xfs_disk_dquot_t *,
|
||||
fs_disk_quota_t *);
|
||||
|
||||
|
||||
/*
|
||||
* Turn off quota accounting and/or enforcement for all udquots and/or
|
||||
|
@ -635,42 +632,6 @@ xfs_qm_scall_setqlim(
|
|||
return error;
|
||||
}
|
||||
|
||||
int
|
||||
xfs_qm_scall_getquota(
|
||||
xfs_mount_t *mp,
|
||||
xfs_dqid_t id,
|
||||
uint type,
|
||||
fs_disk_quota_t *out)
|
||||
{
|
||||
xfs_dquot_t *dqp;
|
||||
int error;
|
||||
|
||||
/*
|
||||
* Try to get the dquot. We don't want it allocated on disk, so
|
||||
* we aren't passing the XFS_QMOPT_DOALLOC flag. If it doesn't
|
||||
* exist, we'll get ENOENT back.
|
||||
*/
|
||||
if ((error = xfs_qm_dqget(mp, NULL, id, type, 0, &dqp))) {
|
||||
return (error);
|
||||
}
|
||||
|
||||
/*
|
||||
* If everything's NULL, this dquot doesn't quite exist as far as
|
||||
* our utility programs are concerned.
|
||||
*/
|
||||
if (XFS_IS_DQUOT_UNINITIALIZED(dqp)) {
|
||||
xfs_qm_dqput(dqp);
|
||||
return XFS_ERROR(ENOENT);
|
||||
}
|
||||
/*
|
||||
* Convert the disk dquot to the exportable format
|
||||
*/
|
||||
xfs_qm_export_dquot(mp, &dqp->q_core, out);
|
||||
xfs_qm_dqput(dqp);
|
||||
return (error ? XFS_ERROR(EFAULT) : 0);
|
||||
}
|
||||
|
||||
|
||||
STATIC int
|
||||
xfs_qm_log_quotaoff_end(
|
||||
xfs_mount_t *mp,
|
||||
|
@ -759,50 +720,66 @@ error0:
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
* Translate an internal style on-disk-dquot to the exportable format.
|
||||
* The main differences are that the counters/limits are all in Basic
|
||||
* Blocks (BBs) instead of the internal FSBs, and all on-disk data has
|
||||
* to be converted to the native endianness.
|
||||
*/
|
||||
STATIC void
|
||||
xfs_qm_export_dquot(
|
||||
xfs_mount_t *mp,
|
||||
xfs_disk_dquot_t *src,
|
||||
int
|
||||
xfs_qm_scall_getquota(
|
||||
struct xfs_mount *mp,
|
||||
xfs_dqid_t id,
|
||||
uint type,
|
||||
struct fs_disk_quota *dst)
|
||||
{
|
||||
struct xfs_dquot *dqp;
|
||||
int error;
|
||||
|
||||
/*
|
||||
* Try to get the dquot. We don't want it allocated on disk, so
|
||||
* we aren't passing the XFS_QMOPT_DOALLOC flag. If it doesn't
|
||||
* exist, we'll get ENOENT back.
|
||||
*/
|
||||
error = xfs_qm_dqget(mp, NULL, id, type, 0, &dqp);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
/*
|
||||
* If everything's NULL, this dquot doesn't quite exist as far as
|
||||
* our utility programs are concerned.
|
||||
*/
|
||||
if (XFS_IS_DQUOT_UNINITIALIZED(dqp)) {
|
||||
error = XFS_ERROR(ENOENT);
|
||||
goto out_put;
|
||||
}
|
||||
|
||||
memset(dst, 0, sizeof(*dst));
|
||||
dst->d_version = FS_DQUOT_VERSION; /* different from src->d_version */
|
||||
dst->d_flags = xfs_qm_export_qtype_flags(src->d_flags);
|
||||
dst->d_id = be32_to_cpu(src->d_id);
|
||||
dst->d_version = FS_DQUOT_VERSION;
|
||||
dst->d_flags = xfs_qm_export_qtype_flags(dqp->q_core.d_flags);
|
||||
dst->d_id = be32_to_cpu(dqp->q_core.d_id);
|
||||
dst->d_blk_hardlimit =
|
||||
XFS_FSB_TO_BB(mp, be64_to_cpu(src->d_blk_hardlimit));
|
||||
XFS_FSB_TO_BB(mp, be64_to_cpu(dqp->q_core.d_blk_hardlimit));
|
||||
dst->d_blk_softlimit =
|
||||
XFS_FSB_TO_BB(mp, be64_to_cpu(src->d_blk_softlimit));
|
||||
dst->d_ino_hardlimit = be64_to_cpu(src->d_ino_hardlimit);
|
||||
dst->d_ino_softlimit = be64_to_cpu(src->d_ino_softlimit);
|
||||
dst->d_bcount = XFS_FSB_TO_BB(mp, be64_to_cpu(src->d_bcount));
|
||||
dst->d_icount = be64_to_cpu(src->d_icount);
|
||||
dst->d_btimer = be32_to_cpu(src->d_btimer);
|
||||
dst->d_itimer = be32_to_cpu(src->d_itimer);
|
||||
dst->d_iwarns = be16_to_cpu(src->d_iwarns);
|
||||
dst->d_bwarns = be16_to_cpu(src->d_bwarns);
|
||||
XFS_FSB_TO_BB(mp, be64_to_cpu(dqp->q_core.d_blk_softlimit));
|
||||
dst->d_ino_hardlimit = be64_to_cpu(dqp->q_core.d_ino_hardlimit);
|
||||
dst->d_ino_softlimit = be64_to_cpu(dqp->q_core.d_ino_softlimit);
|
||||
dst->d_bcount = XFS_FSB_TO_BB(mp, be64_to_cpu(dqp->q_core.d_bcount));
|
||||
dst->d_icount = be64_to_cpu(dqp->q_core.d_icount);
|
||||
dst->d_btimer = be32_to_cpu(dqp->q_core.d_btimer);
|
||||
dst->d_itimer = be32_to_cpu(dqp->q_core.d_itimer);
|
||||
dst->d_iwarns = be16_to_cpu(dqp->q_core.d_iwarns);
|
||||
dst->d_bwarns = be16_to_cpu(dqp->q_core.d_bwarns);
|
||||
dst->d_rtb_hardlimit =
|
||||
XFS_FSB_TO_BB(mp, be64_to_cpu(src->d_rtb_hardlimit));
|
||||
XFS_FSB_TO_BB(mp, be64_to_cpu(dqp->q_core.d_rtb_hardlimit));
|
||||
dst->d_rtb_softlimit =
|
||||
XFS_FSB_TO_BB(mp, be64_to_cpu(src->d_rtb_softlimit));
|
||||
dst->d_rtbcount = XFS_FSB_TO_BB(mp, be64_to_cpu(src->d_rtbcount));
|
||||
dst->d_rtbtimer = be32_to_cpu(src->d_rtbtimer);
|
||||
dst->d_rtbwarns = be16_to_cpu(src->d_rtbwarns);
|
||||
XFS_FSB_TO_BB(mp, be64_to_cpu(dqp->q_core.d_rtb_softlimit));
|
||||
dst->d_rtbcount = XFS_FSB_TO_BB(mp, be64_to_cpu(dqp->q_core.d_rtbcount));
|
||||
dst->d_rtbtimer = be32_to_cpu(dqp->q_core.d_rtbtimer);
|
||||
dst->d_rtbwarns = be16_to_cpu(dqp->q_core.d_rtbwarns);
|
||||
|
||||
/*
|
||||
* Internally, we don't reset all the timers when quota enforcement
|
||||
* gets turned off. No need to confuse the user level code,
|
||||
* so return zeroes in that case.
|
||||
*/
|
||||
if ((!XFS_IS_UQUOTA_ENFORCED(mp) && src->d_flags == XFS_DQ_USER) ||
|
||||
if ((!XFS_IS_UQUOTA_ENFORCED(mp) && dqp->q_core.d_flags == XFS_DQ_USER) ||
|
||||
(!XFS_IS_OQUOTA_ENFORCED(mp) &&
|
||||
(src->d_flags & (XFS_DQ_PROJ | XFS_DQ_GROUP)))) {
|
||||
(dqp->q_core.d_flags & (XFS_DQ_PROJ | XFS_DQ_GROUP)))) {
|
||||
dst->d_btimer = 0;
|
||||
dst->d_itimer = 0;
|
||||
dst->d_rtbtimer = 0;
|
||||
|
@ -823,6 +800,9 @@ xfs_qm_export_dquot(
|
|||
}
|
||||
}
|
||||
#endif
|
||||
out_put:
|
||||
xfs_qm_dqput(dqp);
|
||||
return error;
|
||||
}
|
||||
|
||||
STATIC uint
|
||||
|
|
Loading…
Reference in a new issue