public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Ben Myers <bpm@sgi.com>
To: stable@vger.kernel.org, greg@kroah.com
Cc: Christoph Hellwig <hch@infradead.org>,
	bpm@sgi.com, Alex Elder <aelder@sgi.com>,
	Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>,
	xfs@oss.sgi.com
Subject: [PATCH 6/6] xfs: use doalloc flag in xfs_qm_dqattach_one()
Date: Thu,  1 Dec 2011 17:27:44 -0600	[thread overview]
Message-ID: <1322782064-1723-7-git-send-email-bpm@sgi.com> (raw)
In-Reply-To: <1322782064-1723-1-git-send-email-bpm@sgi.com>

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>
---
 fs/xfs/xfs_qm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 9a0aa76..95ba6dc 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -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;
 
-- 
1.7.8.rc4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2011-12-01 23:27 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-01 23:27 [PATCH 0/6] XFS update for 3.1-stable (again) Ben Myers
2011-12-01 23:27 ` [PATCH 1/6] xfs: don't serialise direct IO reads on page cache checks Ben Myers
2011-12-01 23:27 ` [PATCH 2/6] xfs: avoid direct I/O write vs buffered I/O race Ben Myers
2011-12-01 23:27 ` [PATCH 3/6] xfs: Return -EIO when xfs_vn_getattr() failed Ben Myers
2011-12-01 23:27 ` [PATCH 4/6] xfs: fix buffer flushing during unmount Ben Myers
2011-12-01 23:27 ` [PATCH 5/6] xfs: Fix possible memory corruption in xfs_readlink Ben Myers
2011-12-01 23:27 ` Ben Myers [this message]
2011-12-01 23:33 ` [PATCH 0/6] XFS update for 3.1-stable (again) Greg KH
2011-12-02 23:12   ` Greg KH
2011-12-06 17:05     ` Ben Myers
  -- strict thread matches above, loose matches on Subject: below --
2011-11-28 21:40 [PATCH 0/6] XFS update for 3.1-stable Greg KH
2011-11-30 18:10 ` XFS update for 3.1-stable (resent) Ben Myers
2011-11-30 18:11   ` [PATCH 6/6] xfs: use doalloc flag in xfs_qm_dqattach_one() Ben Myers
2011-11-23 21:38 [PATCH 0/6] XFS update for 3.1-stable Ben Myers
2011-11-23 21:38 ` [PATCH 6/6] xfs: use doalloc flag in xfs_qm_dqattach_one() Ben Myers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1322782064-1723-7-git-send-email-bpm@sgi.com \
    --to=bpm@sgi.com \
    --cc=aelder@sgi.com \
    --cc=greg@kroah.com \
    --cc=hch@infradead.org \
    --cc=mitsuo.hayasaka.hu@hitachi.com \
    --cc=stable@vger.kernel.org \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox