cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Steven Whitehouse <swhiteho@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 12/12] GFS2: Reserve journal space for quota change in do_grow
Date: Mon,  1 Jul 2013 10:33:15 +0100	[thread overview]
Message-ID: <1372671195-3472-13-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1372671195-3472-1-git-send-email-swhiteho@redhat.com>

From: Bob Peterson <rpeterso@redhat.com>

If a GFS2 file system is mounted with quotas and a file is grown
in such a way that its free blocks for the allocation are represented
in a secondary bitmap, GFS2 ran out of blocks in the transaction.
That resulted in "fatal: assertion "tr->tr_num_buf <= tr->tr_blocks".
This patch reserves extra blocks for the quota change so the
transaction has enough space.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 93b5809..5e2f56f 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1232,7 +1232,9 @@ static int do_grow(struct inode *inode, u64 size)
 		unstuff = 1;
 	}
 
-	error = gfs2_trans_begin(sdp, RES_DINODE + RES_STATFS + RES_RG_BIT, 0);
+	error = gfs2_trans_begin(sdp, RES_DINODE + RES_STATFS + RES_RG_BIT +
+				 (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF ?
+				  0 : RES_QUOTA), 0);
 	if (error)
 		goto do_grow_release;
 
-- 
1.7.4



      parent reply	other threads:[~2013-07-01  9:33 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-01  9:33 [Cluster-devel] GFS2: Pre-pull patch posting (merge window) Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 01/12] GFS2: Sort buffer lists by inplace block number Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 02/12] GFS2: Eliminate gfs2_rg_lops Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 03/12] GFS2: Cocci spatch "ptr_ret.spatch" Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 04/12] GFS2: Remove no-op wrapper function Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 05/12] GFS2: fix error propagation in init_threads() Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 06/12] GFS2: Only do one directory search on create Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 07/12] GFS2: Add atomic_open support Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 08/12] GFS2: fix regression in dir_double_exhash Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 09/12] GFS2: aggressively issue revokes in gfs2_log_flush Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 10/12] GFS2: fix warning message Steven Whitehouse
2013-07-01  9:33 ` [Cluster-devel] [PATCH 11/12] GFS2: Fix fstrim boundary conditions Steven Whitehouse
2013-07-01  9:33 ` Steven Whitehouse [this message]

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=1372671195-3472-13-git-send-email-swhiteho@redhat.com \
    --to=swhiteho@redhat.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;
as well as URLs for NNTP newsgroup(s).