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

Commit 4a586812 authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

GFS2: Set log descriptor type for jdata blocks 



This patch sets the log descriptor type according to whether the
journal commit is for (journaled) data or metadata. This was
recently broken when the functions to process data and metadata
log ops were combined.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent aa4f6084

fs/gfs2/lops.c

+3 −1
Original line number Diff line number Diff line
@@ -419,7 +419,9 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit, 
		if (total > limit)

			num = limit;

		gfs2_log_unlock(sdp);

		page = gfs2_get_log_desc(sdp, GFS2_LOG_DESC_METADATA, num + 1, num);

		page = gfs2_get_log_desc(sdp,

					 is_databuf ? GFS2_LOG_DESC_JDATA :

					 GFS2_LOG_DESC_METADATA, num + 1, num);

		ld = page_address(page);

		gfs2_log_lock(sdp);

		ptr = (__be64 *)(ld + 1);