Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1c0643f authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Move journal live test at transaction start 



There seems little point grabbing the transaction glock
only to have to release it again if the journal isn't
live. This moves the test earlier to avoid grabbing the lock
when we don't need it in the first place.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 7537d81a

fs/gfs2/trans.c

+3 −6
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks, 
	BUG_ON(current->journal_info);

	BUG_ON(blocks == 0 && revokes == 0);



	if (!test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags))

		return -EROFS;



	tr = kzalloc(sizeof(struct gfs2_trans), GFP_NOFS);

	if (!tr)

		return -ENOMEM;
@@ -54,12 +57,6 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks, 
	if (error)

		goto fail_holder_uninit;



	if (!test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) {

		tr->tr_t_gh.gh_flags |= GL_NOCACHE;

		error = -EROFS;

		goto fail_gunlock;

	}



	error = gfs2_log_reserve(sdp, tr->tr_reserved);

	if (error)

		goto fail_gunlock;