diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2010-06-25 01:21:20 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2010-07-29 10:36:56 +0200 |
| commit | 461cb419f074aab16836a660efb8e855b6c1609c (patch) | |
| tree | 0b4ca5ab5c01efc37505a43ad96dbc94ae2bb95b /fs/gfs2/super.c | |
| parent | GFS2: Wait for journal id on mount if not specified on mount command line (diff) | |
| download | linux-461cb419f074aab16836a660efb8e855b6c1609c.tar.xz linux-461cb419f074aab16836a660efb8e855b6c1609c.zip | |
GFS2: Simplify gfs2_write_alloc_required
Function gfs2_write_alloc_required always returned zero as its
return code. Therefore, it doesn't need to return a return code
at all. Given that, we can use the return value to return whether
or not the dinode needs block allocations rather than passing
that value in, which in turn simplifies a bunch of error checking.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
| -rw-r--r-- | fs/gfs2/super.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 4d1aad38f1b1..4140811a921c 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -342,8 +342,6 @@ int gfs2_jdesc_check(struct gfs2_jdesc *jd) { struct gfs2_inode *ip = GFS2_I(jd->jd_inode); struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode); - int ar; - int error; if (ip->i_disksize < (8 << 20) || ip->i_disksize > (1 << 30) || (ip->i_disksize & (sdp->sd_sb.sb_bsize - 1))) { @@ -352,13 +350,12 @@ int gfs2_jdesc_check(struct gfs2_jdesc *jd) } jd->jd_blocks = ip->i_disksize >> sdp->sd_sb.sb_bsize_shift; - error = gfs2_write_alloc_required(ip, 0, ip->i_disksize, &ar); - if (!error && ar) { + if (gfs2_write_alloc_required(ip, 0, ip->i_disksize)) { gfs2_consist_inode(ip); - error = -EIO; + return -EIO; } - return error; + return 0; } /** |