diff options
author | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:55:27 +1000 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:55:27 +1000 |
commit | 645f9857213476407d8ed1b59619fdff7128d3e6 (patch) | |
tree | f48e76ffa8b4af8bfa0c64d54ff96d76b61f6f65 /fs/xfs/xfs_qm.c | |
parent | b076d8720d793cde04b75b4941b8774e209649b4 (diff) | |
parent | 4ef897a27543b513351262881660147366c042a1 (diff) | |
download | op-kernel-dev-645f9857213476407d8ed1b59619fdff7128d3e6.zip op-kernel-dev-645f9857213476407d8ed1b59619fdff7128d3e6.tar.gz |
Merge branch 'xfs-misc-fixes-3.17-2' into for-next
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 7e1a80b..1023210 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -911,6 +911,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); @@ -996,7 +1002,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++; } } |