diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2015-07-16 08:28:04 -0500 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2015-12-14 12:16:38 -0600 |
| commit | a097dc7e24cba7980bc5e2df461a4ef228e97e59 (patch) | |
| tree | bfe9075d7d759fe136d540cea595dfbc4c81f361 /fs/gfs2/super.c | |
| parent | b54e9a0b92d44843f6719ae22b0f6daf5b9b23b4 (diff) | |
| download | linux-a097dc7e24cba7980bc5e2df461a4ef228e97e59.tar.bz2 | |
GFS2: Make rgrp reservations part of the gfs2_inode structure
Before this patch, multi-block reservation structures were allocated
from a special slab. This patch folds the structure into the gfs2_inode
structure. The disadvantage is that the gfs2_inode needs more memory,
even when a file is opened read-only. The advantages are: (a) we don't
need the special slab and the extra time it takes to allocate and
deallocate from it. (b) we no longer need to worry that the structure
exists for things like quota management. (c) This also allows us to
remove the calls to get_write_access and put_write_access since we
know the structure will exist.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
| -rw-r--r-- | fs/gfs2/super.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index b030ca223067..64f03c821b5d 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -1593,8 +1593,8 @@ out_truncate: out_unlock: /* Error path for case 1 */ - if (gfs2_rs_active(ip->i_res)) - gfs2_rs_deltree(ip->i_res); + if (gfs2_rs_active(&ip->i_res)) + gfs2_rs_deltree(&ip->i_res); if (test_bit(HIF_HOLDER, &ip->i_iopen_gh.gh_iflags)) { ip->i_iopen_gh.gh_flags |= GL_NOCACHE; @@ -1632,7 +1632,8 @@ static struct inode *gfs2_alloc_inode(struct super_block *sb) ip->i_flags = 0; ip->i_gl = NULL; ip->i_rgd = NULL; - ip->i_res = NULL; + memset(&ip->i_res, 0, sizeof(ip->i_res)); + RB_CLEAR_NODE(&ip->i_res.rs_node); ip->i_rahead = 0; } return &ip->i_inode; |