| From b8bc6400be4f315bfaef65ffadcd5f27ee10571d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 18 Dec 2018 08:29:32 -0600 |
| Subject: gfs2: take jdata unstuff into account in do_grow |
| |
| From: Bob Peterson <rpeterso@redhat.com> |
| |
| [ Upstream commit bc0205612bbd4dd4026d4ba6287f5643c37366ec ] |
| |
| Before this patch, function do_grow would not reserve enough journal |
| blocks in the transaction to unstuff jdata files while growing them. |
| This patch adds the logic to add one more block if the file to grow |
| is jdata. |
| |
| Signed-off-by: Bob Peterson <rpeterso@redhat.com> |
| Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/gfs2/bmap.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c |
| index 39af17b407f00..d83e99fa98b3a 100644 |
| --- a/fs/gfs2/bmap.c |
| +++ b/fs/gfs2/bmap.c |
| @@ -1236,6 +1236,8 @@ static int do_grow(struct inode *inode, u64 size) |
| } |
| |
| error = gfs2_trans_begin(sdp, RES_DINODE + RES_STATFS + RES_RG_BIT + |
| + (unstuff && |
| + gfs2_is_jdata(ip) ? RES_JDATA : 0) + |
| (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF ? |
| 0 : RES_QUOTA), 0); |
| if (error) |
| -- |
| 2.20.1 |
| |
