Commit ab5c5f63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs 

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  MAINTAINERS: update XFS maintainer entry
  xfs: use doalloc flag in xfs_qm_dqattach_one()
parents c5e0c782 c8891329

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -7436,7 +7436,8 @@ F: drivers/xen/*swiotlb* 


XFS FILESYSTEM

P:	Silicon Graphics Inc

M:	Alex Elder <aelder@sgi.com>

M:	Ben Myers <bpm@sgi.com>

M:	Alex Elder <elder@kernel.org>

M:	xfs-masters@oss.sgi.com

L:	xfs@oss.sgi.com

W:	http://oss.sgi.com/projects/xfs

fs/xfs/xfs_qm.c

+2 −1
Original line number Diff line number Diff line
@@ -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;