[Top] [All Lists]

[50/53] xfs: use doalloc flag in xfs_qm_dqattach_one()

To: linux-kernel@xxxxxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx
Subject: [50/53] xfs: use doalloc flag in xfs_qm_dqattach_one()
From: Greg KH <gregkh@xxxxxxx>
Date: Tue, 22 Nov 2011 16:23:57 -0800
Cc: torvalds@xxxxxxxxxxxxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx, alan@xxxxxxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx, Mitsuo Hayasaka <mitsuo.hayasaka.hu@xxxxxxxxxxx>, Alex Elder <aelder@xxxxxxx>, Ben Myers <bpm@xxxxxxx>, Christoph Hellwig <hch@xxxxxxxxxxxxx>
In-reply-to: <20111123002419.GA8531@xxxxxxxxx>
User-agent: quilt/0.48-20.1.2
3.0-stable review patch.  If anyone has any objections, please let me know.


From: Mitsuo Hayasaka <mitsuo.hayasaka.hu@xxxxxxxxxxx>

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@xxxxxx>
        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@xxxxxxxxxxx>
Cc: Alex Elder <aelder@xxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Ben Myers <bpm@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
 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;

<Prev in Thread] Current Thread [Next in Thread>
  • [50/53] xfs: use doalloc flag in xfs_qm_dqattach_one(), Greg KH <=