author: Andreas Gruenbacher <agruenba@redhat.com> 2020-03-16 15:36:09 +0100
committer: Andreas Gruenbacher <agruenba@redhat.com> 2021-01-18 16:56:36 +0100
commit: 3ed08befeb09e199c258fc4f3878935f57a2bd9a
parent: c65b76b893032a9fa69056656c771f5e2fc9ef0c
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 6 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 391186382cee..4f3337fd6b23 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -2386,7 +2386,6 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks,
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
struct buffer_head *dibh;
struct gfs2_rbm rbm = { .rgd = ip->i_res.rs_rgd, };
- unsigned int ndata;
u64 block; /* block, within the file system scope */
int error;
@@ -2412,12 +2411,8 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks,
rbm.rgd->rd_last_alloc = block - rbm.rgd->rd_data0;
if (gfs2_rs_active(&ip->i_res))
gfs2_adjust_reservation(ip, &rbm, *nblocks);
- ndata = *nblocks;
- if (dinode)
- ndata--;
-
if (!dinode) {
- ip->i_goal = block + ndata - 1;
+ ip->i_goal = block + *nblocks - 1;
error = gfs2_meta_inode_buffer(ip, &dibh);
if (error == 0) {
struct gfs2_dinode *di =