diff options
| author |   Bob Peterson <rpeterso@redhat.com> | 2010-06-24 19:21:20 -0400 |
|---|---|---|
| committer |   Steven Whitehouse <swhiteho@redhat.com> | 2010-07-29 09:36:56 +0100 |
| commit | 461cb419f074aab16836a660efb8e855b6c1609c (patch) | |
| tree | 0b4ca5ab5c01efc37505a43ad96dbc94ae2bb95b /fs/gfs2/aops.c | |
| parent | GFS2: Wait for journal id on mount if not specified on mount command line (diff) | |
| download | linux-dev-461cb419f074aab16836a660efb8e855b6c1609c.tar.xz linux-dev-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/aops.c')
| -rw-r--r-- | fs/gfs2/aops.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 9485a882d80b..5e96cbd8a454 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -634,9 +634,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, } } - error = gfs2_write_alloc_required(ip, pos, len, &alloc_required); - if (error) - goto out_unlock; + alloc_required = gfs2_write_alloc_required(ip, pos, len); if (alloc_required || gfs2_is_jdata(ip)) gfs2_write_calc_reserv(ip, len, &data_blocks, &ind_blocks); |