diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2012-05-18 13:28:23 (GMT) |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-06-06 10:20:22 (GMT) |
| commit | 5407e24229408d7586ee451a384fc13e4a2332be (patch) | |
| tree | 7534b0d0fc69de50b6156ec4e384a71acf01dea1 /fs/gfs2/dir.c | |
| parent | 0a305e496059a113f93bdd3ad27a5aaa917fe34d (diff) | |
| download | linux-5407e24229408d7586ee451a384fc13e4a2332be.tar.xz | |
GFS2: Fold quota data into the reservations struct
This patch moves the ancillary quota data structures into the
block reservations structure. This saves GFS2 some time and
effort in allocating and deallocating the qadata structure.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/dir.c')
| -rw-r--r-- | fs/gfs2/dir.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 8aaeb07..259b088 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -1854,14 +1854,9 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, if (!ht) return -ENOMEM; - if (!gfs2_qadata_get(dip)) { - error = -ENOMEM; - goto out; - } - error = gfs2_quota_hold(dip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE); if (error) - goto out_put; + goto out; /* Count the number of leaves */ bh = leaf_bh; @@ -1942,8 +1937,6 @@ out_rg_gunlock: out_rlist: gfs2_rlist_free(&rlist); gfs2_quota_unhold(dip); -out_put: - gfs2_qadata_put(dip); out: kfree(ht); return error; |