diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-08 21:04:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-08 21:04:25 +0100 |
| commit | 89cda06d7f9c3c111a81fcdf5464926f5f984ebc (patch) | |
| tree | bfa46c20c325feccd9de1a293e11686981d63e7b /fs/xfs/xfs_qm.c | |
| parent | ede8342bf63166e8d8fc3c05fc0985b27cc8186b (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| download | linux-89cda06d7f9c3c111a81fcdf5464926f5f984ebc.tar.bz2 | |
Merge tag 'v4.0-rc7' into spi-img-spfi
Linux 4.0-rc7
Diffstat (limited to 'fs/xfs/xfs_qm.c')
| -rw-r--r-- | fs/xfs/xfs_qm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 53cc2aaf8d2b..fbbb9e62e274 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -836,6 +836,11 @@ xfs_qm_reset_dqcounts( */ xfs_dqcheck(mp, ddq, id+j, type, XFS_QMOPT_DQREPAIR, "xfs_quotacheck"); + /* + * Reset type in case we are reusing group quota file for + * project quotas or vice versa + */ + ddq->d_flags = type; ddq->d_bcount = 0; ddq->d_icount = 0; ddq->d_rtbcount = 0; |