diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2009-08-17 06:06:43 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2009-08-17 06:06:43 -0400 |
commit | 05164e5b37a8329bfbcf72f526302cb2dd885fbd (patch) | |
tree | 069af9ca385f0c7d9cb273d0c3b70c6c3b2043f3 /fs | |
parent | 6050b9c74f24513191fc6b5e4b3583e38d146bf5 (diff) |
GFS2: Replace assertion with proper error handling
One fewer assert, one more place we can recover gracefully
if there is an error.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | 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 3d0193af19c3..c681c54fbd60 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) | |||
1561 | 1561 | ||
1562 | rgd->rd_last_alloc = blk; | 1562 | rgd->rd_last_alloc = blk; |
1563 | block = rgd->rd_data0 + blk; | 1563 | block = rgd->rd_data0 + blk; |
1564 | gfs2_assert_withdraw(sdp, rgd->rd_free); | 1564 | if (rgd->rd_free == 0) |
1565 | goto rgrp_error; | ||
1566 | |||
1565 | rgd->rd_free--; | 1567 | rgd->rd_free--; |
1566 | rgd->rd_dinodes++; | 1568 | rgd->rd_dinodes++; |
1567 | *generation = rgd->rd_igeneration++; | 1569 | *generation = rgd->rd_igeneration++; |