diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2018-08-30 16:01:50 +0100 |
---|---|---|
committer | Bob Peterson <rpeterso@redhat.com> | 2018-10-12 07:29:14 -0500 |
commit | 21f09c4395c95dfaa0598d20d41cb2a669e1967e (patch) | |
tree | 997637a5fd6f19f1f0a149970ff55b6872d4c0f2 /fs/gfs2/incore.h | |
parent | 3548fce1645bafbeb2256caaa3635a21bafd1621 (diff) | |
download | linux-stable-21f09c4395c95dfaa0598d20d41cb2a669e1967e.tar.gz linux-stable-21f09c4395c95dfaa0598d20d41cb2a669e1967e.tar.bz2 linux-stable-21f09c4395c95dfaa0598d20d41cb2a669e1967e.zip |
gfs2: Move rs_{sizehint, rgd_gh} fields into the inode
Move the rs_sizehint and rs_rgd_gh fields from struct gfs2_blkreserv
into the inode: they are more closely related to the inode than to a
particular reservation.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/incore.h')
-rw-r--r-- | fs/gfs2/incore.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 5d72e8b66a26..997a3a19f77d 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -309,10 +309,6 @@ struct gfs2_qadata { /* quota allocation data */ */ struct gfs2_blkreserv { - /* components used during write (step 1): */ - atomic_t rs_sizehint; /* hint of the write size */ - - struct gfs2_holder rs_rgd_gh; /* Filled in by get_local_rgrp */ struct rb_node rs_node; /* link to other block reservations */ struct gfs2_rbm rs_rbm; /* Start of reservation */ u32 rs_free; /* how many blocks are still free */ @@ -417,8 +413,10 @@ struct gfs2_inode { struct gfs2_holder i_iopen_gh; struct gfs2_holder i_gh; /* for prepare/commit_write only */ struct gfs2_qadata *i_qadata; /* quota allocation data */ + struct gfs2_holder i_rgd_gh; struct gfs2_blkreserv i_res; /* rgrp multi-block reservation */ u64 i_goal; /* goal block for allocations */ + atomic_t i_sizehint; /* hint of the write size */ struct rw_semaphore i_rw_mutex; struct list_head i_ordered; struct list_head i_trunc_list; |