| From hch@infradead.org Tue Nov 22 13:39:12 2011 |
| From: Christoph Hellwig <hch@infradead.org> |
| Date: Sat, 19 Nov 2011 13:13:45 -0500 |
| Subject: xfs: use doalloc flag in xfs_qm_dqattach_one() |
| To: stable@vger.kernel.org |
| Cc: xfs@oss.sgi.com, Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>, Alex Elder <aelder@sgi.com>, Ben Myers <bpm@sgi.com> |
| Message-ID: <20111119181545.413417685@bombadil.infradead.org> |
| |
| From: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com> |
| |
| commit db3e74b582915d66e10b0c73a62763418f54c340 upstream |
| |
| The doalloc arg in xfs_qm_dqattach_one() is a flag that indicates |
| whether a new area to handle quota information will be allocated |
| if needed. Originally, it was passed to xfs_qm_dqget(), but has |
| been removed by the following commit (probably by mistake): |
| |
| commit 8e9b6e7fa4544ea8a0e030c8987b918509c8ff47 |
| Author: Christoph Hellwig <hch@lst.de> |
| Date: Sun Feb 8 21:51:42 2009 +0100 |
| |
| xfs: remove the unused XFS_QMOPT_DQLOCK flag |
| |
| As the result, xfs_qm_dqget() called from xfs_qm_dqattach_one() |
| never allocates the new area even if it is needed. |
| |
| This patch gives the doalloc arg to xfs_qm_dqget() in |
| xfs_qm_dqattach_one() to fix this problem. |
| |
| Signed-off-by: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com> |
| Cc: Alex Elder <aelder@sgi.com> |
| Cc: Christoph Hellwig <hch@infradead.org> |
| Reviewed-by: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Ben Myers <bpm@sgi.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| fs/xfs/quota/xfs_qm.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/fs/xfs/quota/xfs_qm.c |
| +++ b/fs/xfs/quota/xfs_qm.c |
| @@ -714,7 +714,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; |
| |
