Re: [RFC v6 PATCH 5/5] xfs: Add a new field to fs_quota_stat to get pquota information

Chandra Seetharaman
2012-08-22T23:40:01Z

Thanks for the review..

On Wed, 2012-08-15 at 12:37 +1000, Dave Chinner wrote:
> On Fri, Jul 20, 2012 at 06:03:05PM -0500, Chandra Seetharaman wrote:
> > Use separate structure for filling the project quota information
> > for the Q_XGETQSTAT quota command.
> >
> > Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
> > ---
> > fs/xfs/xfs_qm_syscalls.c | 26 +++++++++++++-------------
> > 1 files changed, 13 insertions(+), 13 deletions(-)
> >
> > diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> > index f011cf3..482efc0 100644
> > --- a/fs/xfs/xfs_qm_syscalls.c
> > +++ b/fs/xfs/xfs_qm_syscalls.c
> > @@ -421,7 +421,6 @@ xfs_qm_scall_getqstat(
> > tempuqip = tempgqip = temppqip = B_FALSE;
> > memset(out, 0, sizeof(fs_quota_stat_t));
> >
> > - out->qs_version = FS_QSTAT_VERSION;
> > if (!xfs_sb_version_hasquota(&mp->m_sb)) {
> > out->qs_uquota.qfs_ino = NULLFSINO;
> > out->qs_gquota.qfs_ino = NULLFSINO;
> > @@ -434,8 +433,6 @@ xfs_qm_scall_getqstat(
> > out->qs_pad = 0;
> > out->qs_uquota.qfs_ino = mp->m_sb.sb_uquotino;
> > out->qs_gquota.qfs_ino = mp->m_sb.sb_gquotino;
> > - if (&out->qs_gquota != &out->qs_pquota)
> > - out->qs_pquota.qfs_ino = mp->m_sb.sb_pquotino;
> >
> > if (q) {
> > uip = q->qi_uquotaip;
> > @@ -452,11 +449,6 @@ xfs_qm_scall_getqstat(
> > 0, 0, &gip) == 0)
> > tempgqip = B_TRUE;
> > }
> > - if (!pip && mp->m_sb.sb_pquotino != NULLFSINO) {
> > - if (xfs_iget(mp, NULL, mp->m_sb.sb_pquotino,
> > - 0, 0, &pip) == 0)
> > - temppqip = B_TRUE;
> > - }
> > if (uip) {
> > out->qs_uquota.qfs_nblks = uip->i_d.di_nblocks;
> > out->qs_uquota.qfs_nextents = uip->i_d.di_nextents;
> > @@ -469,11 +461,19 @@ xfs_qm_scall_getqstat(
> > if (tempgqip)
> > IRELE(gip);
> > }
> > - if (pip) {
> > - out->qs_pquota.qfs_nblks = pip->i_d.di_nblocks;
> > - out->qs_pquota.qfs_nextents = pip->i_d.di_nextents;
> > - if (temppqip)
> > - IRELE(pip);
> > + if (out->qs_version >= FS_QSTAT_VERSION_2) {
> > + out->qs_pquota.qfs_ino = mp->m_sb.sb_pquotino;
> > + if (!pip && mp->m_sb.sb_pquotino != NULLFSINO) {
> > + if (xfs_iget(mp, NULL, mp->m_sb.sb_pquotino,
> > + 0, 0, &pip) == 0)
> > + temppqip = B_TRUE;
> > + }
> > + if (pip) {
> > + out->qs_pquota.qfs_nblks = pip->i_d.di_nblocks;
> > + out->qs_pquota.qfs_nextents = pip->i_d.di_nextents;
> > + if (temppqip)
> > + IRELE(pip);
> > + }
>
> Doesn't this mean that we'll never report project quota for
> FS_QSTAT_VERSION structures and the old quota format? i.e. existing
> tools with a new kernel won't return the project quota info in the
> group quota fields?

Good catch. I will add additional code to check the qs_version and the
new pquota flag to cover that combination.

>
> Cheers,
>
> Dave.