Commit ab5c5f63 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://

* 'for-linus' of git://
  MAINTAINERS: update XFS maintainer entry
  xfs: use doalloc flag in xfs_qm_dqattach_one()
parents c5e0c782 c8891329
......@@ -7436,7 +7436,8 @@ F: drivers/xen/*swiotlb*
P: Silicon Graphics Inc
M: Alex Elder <>
M: Ben Myers <>
M: Alex Elder <>
......@@ -674,7 +674,8 @@ xfs_qm_dqattach_one(
* disk and we didn't ask it to allocate;
* ESRCH if quotas got turned off suddenly.
error = xfs_qm_dqget(ip->i_mount, ip, id, type, XFS_QMOPT_DOWARN, &dqp);
error = xfs_qm_dqget(ip->i_mount, ip, id, type,
doalloc | XFS_QMOPT_DOWARN, &dqp);
if (error)
return error;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment