diff options
| author |   Bob Peterson <rpeterso@redhat.com> | 2019-12-13 08:10:51 -0600 |
|---|---|---|
| committer |   Andreas Gruenbacher <agruenba@redhat.com> | 2020-01-07 18:46:06 +0100 |
| commit | 2e9eeaa1175112ac494ba3c2ea4b71b1febeb6ab (patch) | |
| tree | 59466b5246f6082416ad40f27b3a27bab38529c4 /fs/gfs2/log.c | |
| parent | gfs2: Another gfs2_find_jhead fix (diff) | |
| download | linux-dev-2e9eeaa1175112ac494ba3c2ea4b71b1febeb6ab.tar.xz linux-dev-2e9eeaa1175112ac494ba3c2ea4b71b1febeb6ab.zip | |
gfs2: eliminate ssize parameter from gfs2_struct2blk
Every caller of function gfs2_struct2blk specified sizeof(u64).
This patch eliminates the unnecessary parameter and replaces the
size calculation with a new superblock variable that is computed
to be the maximum number of block pointers we can fit inside a
log descriptor, as is done for pointers per dinode and indirect
block.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Andrew Price <anprice@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2/log.c')
| -rw-r--r-- | fs/gfs2/log.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index eb3f2e7b8085..66189ae62c1d 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -37,7 +37,6 @@ static void gfs2_log_shutdown(struct gfs2_sbd *sdp); * gfs2_struct2blk - compute stuff * @sdp: the filesystem * @nstruct: the number of structures - * @ssize: the size of the structures * * Compute the number of log descriptor blocks needed to hold a certain number * of structures of a certain size. @@ -45,18 +44,16 @@ static void gfs2_log_shutdown(struct gfs2_sbd *sdp); * Returns: the number of blocks needed (minimum is always 1) */ -unsigned int gfs2_struct2blk(struct gfs2_sbd *sdp, unsigned int nstruct, - unsigned int ssize) +unsigned int gfs2_struct2blk(struct gfs2_sbd *sdp, unsigned int nstruct) { unsigned int blks; unsigned int first, second; blks = 1; - first = (sdp->sd_sb.sb_bsize - sizeof(struct gfs2_log_descriptor)) / ssize; + first = sdp->sd_ldptrs; if (nstruct > first) { - second = (sdp->sd_sb.sb_bsize - - sizeof(struct gfs2_meta_header)) / ssize; + second = sdp->sd_inptrs; blks += DIV_ROUND_UP(nstruct - first, second); } @@ -473,8 +470,7 @@ static unsigned int calc_reserved(struct gfs2_sbd *sdp) } if (sdp->sd_log_commited_revoke > 0) - reserved += gfs2_struct2blk(sdp, sdp->sd_log_commited_revoke, - sizeof(u64)); + reserved += gfs2_struct2blk(sdp, sdp->sd_log_commited_revoke); /* One for the overall header */ if (reserved) reserved++; |