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/quota.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/quota.c')
| -rw-r--r-- | fs/gfs2/quota.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 8f02d3db8f42..8bb643cb2658 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -787,15 +787,9 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda) goto out; for (x = 0; x < num_qd; x++) { - int alloc_required; - offset = qd2offset(qda[x]); - error = gfs2_write_alloc_required(ip, offset, - sizeof(struct gfs2_quota), - &alloc_required); - if (error) - goto out_gunlock; - if (alloc_required) + if (gfs2_write_alloc_required(ip, offset, + sizeof(struct gfs2_quota))) nalloc++; } @@ -1584,10 +1578,7 @@ static int gfs2_set_dqblk(struct super_block *sb, int type, qid_t id, goto out_i; offset = qd2offset(qd); - error = gfs2_write_alloc_required(ip, offset, sizeof(struct gfs2_quota), - &alloc_required); - if (error) - goto out_i; + alloc_required = gfs2_write_alloc_required(ip, offset, sizeof(struct gfs2_quota)); if (alloc_required) { al = gfs2_alloc_get(ip); if (al == NULL) |