GFS2: Replace assertion with proper error handling
authorSteven Whitehouse <swhiteho@redhat.com>
Mon, 17 Aug 2009 10:06:43 +0000 (11:06 +0100)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 17 Aug 2009 10:06:43 +0000 (11:06 +0100)
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

index 3d0193a..c681c54 100644 (file)
@@ -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++;