From: Steven Whitehouse <swhiteho@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 04/15] GFS2: Replace assertion with proper error handling
Date: Thu, 10 Sep 2009 12:27:56 +0100 [thread overview]
Message-ID: <1252582087-10007-5-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1252582087-10007-4-git-send-email-swhiteho@redhat.com>
One fewer assert, one more place we can recover gracefully
if there is an error.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
fs/gfs2/rgrp.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 3d0193a..c681c54 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1561,7 +1561,9 @@ int gfs2_alloc_di(struct gfs2_inode *dip, u64 *bn, u64 *generation)
rgd->rd_last_alloc = blk;
block = rgd->rd_data0 + blk;
- gfs2_assert_withdraw(sdp, rgd->rd_free);
+ if (rgd->rd_free == 0)
+ goto rgrp_error;
+
rgd->rd_free--;
rgd->rd_dinodes++;
*generation = rgd->rd_igeneration++;
--
1.6.2.5
next prev parent reply other threads:[~2009-09-10 11:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-10 11:27 [Cluster-devel] GFS2: Pre-pull patch posting Steven Whitehouse
2009-09-10 11:27 ` [Cluster-devel] [PATCH 01/15] GFS2: Add online uevent to GFS2 Steven Whitehouse
2009-09-10 11:27 ` [Cluster-devel] [PATCH 02/15] GFS2: Add some more info to uevents Steven Whitehouse
2009-09-10 11:27 ` [Cluster-devel] [PATCH 03/15] GFS2: Improve error handling in inode allocation Steven Whitehouse
2009-09-10 11:27 ` Steven Whitehouse [this message]
2009-09-10 11:27 ` [Cluster-devel] [PATCH 05/15] GFS2: Add sysfs link to device Steven Whitehouse
2009-09-10 11:27 ` [Cluster-devel] [PATCH 06/15] GFS2: Add a document explaining GFS2's uevents Steven Whitehouse
2009-09-10 11:27 ` [Cluster-devel] [PATCH 07/15] GFS2: free disk inode which is deleted by remote node -V2 Steven Whitehouse
2009-09-10 11:28 ` [Cluster-devel] [PATCH 08/15] GFS2: jumping to wrong label? Steven Whitehouse
2009-09-10 11:28 ` [Cluster-devel] [PATCH 09/15] GFS2: Add "-o errors=panic|withdraw" mount options Steven Whitehouse
2009-09-10 11:28 ` [Cluster-devel] [PATCH 10/15] GFS2: Add explanation of extended attr on-disk format Steven Whitehouse
2009-09-10 11:28 ` [Cluster-devel] [PATCH 11/15] GFS2: Clean up of extended attribute support Steven Whitehouse
2009-09-10 11:28 ` [Cluster-devel] [PATCH 12/15] GFS2: Rename eattr.[ch] as xattr.[ch] Steven Whitehouse
2009-09-10 11:28 ` [Cluster-devel] [PATCH 13/15] GFS2: Remove no_formal_ino generating code Steven Whitehouse
2009-09-10 11:28 ` [Cluster-devel] [PATCH 14/15] GFS2: Be extra careful about deallocating inodes Steven Whitehouse
2009-09-10 11:28 ` [Cluster-devel] [PATCH 15/15] GFS2: Remove unused sysfs file Steven Whitehouse
[not found] ` <1252593990.30578.180.camel@desktop>
2009-09-14 7:57 ` [Cluster-devel] Re: GFS2: Pre-pull patch posting Steven Whitehouse
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=1252582087-10007-5-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).