diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2021-02-03 16:15:27 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2021-02-03 16:33:16 +0100 |
| commit | 15e20a301ab06575482c7ab3b442a6830cec928e (patch) | |
| tree | 1df898835ae3e188d7268689ba4f4cc6b611d525 /fs/gfs2/glops.c | |
| parent | 6e80674af06c0dca6e0153d492d437f3f07fe3e9 (diff) | |
| download | lwn-15e20a301ab06575482c7ab3b442a6830cec928e.tar.gz lwn-15e20a301ab06575482c7ab3b442a6830cec928e.zip | |
gfs2: Use sb_start_intwrite in gfs2_ail_empty_gl
Commit 2e60d7683c8d ("GFS2: update freeze code to use freeze/thaw_super
on all nodes") optimized away the sb_start_intwrite ... sb_end_intwrite
protection for the on-stack transactions in gfs2_ail_empty_gl with no
explanation. I can't think of a valid reason for doing that, so revert
that change. This simplifies the next commit.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2/glops.c')
| -rw-r--r-- | fs/gfs2/glops.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 3faa421568b0..fd1f52fff170 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -127,9 +127,12 @@ static int gfs2_ail_empty_gl(struct gfs2_glock *gl) * on the stack */ tr.tr_reserved = 1 + gfs2_struct2blk(sdp, tr.tr_revokes); tr.tr_ip = _RET_IP_; + sb_start_intwrite(sdp->sd_vfs); ret = gfs2_log_reserve(sdp, tr.tr_reserved); - if (ret < 0) + if (ret < 0) { + sb_end_intwrite(sdp->sd_vfs); return ret; + } WARN_ON_ONCE(current->journal_info); current->journal_info = &tr; |