diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
| commit | d831fd1b46d04e5c8c8a0431c321578d25852695 (patch) | |
| tree | 53a685712d0f0debe66de80c1f0a5e545d0de7e2 /fs/xfs/xfs_qm.c | |
| parent | c95c4e2a6bb8d44f9a8f59eadd99a9a615c53112 (diff) | |
| parent | 339f8f37f0203884332585e38c06536c8477d475 (diff) | |
Merge tag 'v3.10.55' into linux-linaro-lsklsk-v3.10-14.09
This is the 3.10.55 stable release
Diffstat (limited to 'fs/xfs/xfs_qm.c')
| -rw-r--r-- | fs/xfs/xfs_qm.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index b75c9bb6e71e..29d1ca567ed3 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -935,6 +935,12 @@ xfs_qm_dqiter_bufs( if (error) break; + /* + * A corrupt buffer might not have a verifier attached, so + * make sure we have the correct one attached before writeback + * occurs. + */ + bp->b_ops = &xfs_dquot_buf_ops; xfs_qm_reset_dqcounts(mp, bp, firstid, type); xfs_buf_delwri_queue(bp, buffer_list); xfs_buf_relse(bp); @@ -1018,7 +1024,7 @@ xfs_qm_dqiterate( xfs_buf_readahead(mp->m_ddev_targp, XFS_FSB_TO_DADDR(mp, rablkno), mp->m_quotainfo->qi_dqchunklen, - NULL); + &xfs_dquot_buf_ops); rablkno++; } } |