summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2013-05-24 15:02:49 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2013-06-03 16:38:39 +0100
commit4a586812055dbd2588b0836ab758f6b9670c3949 (patch)
tree75d68af866e2102dd18f492ae37da5c1766ed165
parentaa4f608478acb7ed69dfcff4f3c404100b78ac49 (diff)
downloadop-kernel-dev-4a586812055dbd2588b0836ab758f6b9670c3949.zip
op-kernel-dev-4a586812055dbd2588b0836ab758f6b9670c3949.tar.gz
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: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/lops.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 68b4c8f..6c33d7b 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -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);
OpenPOWER on IntegriCloud