aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/lops.c
diff options
context:
space:
mode:
authorRussell Cattelan <cattelan@redhat.com>2006-10-12 09:23:41 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-10-12 17:11:13 -0400
commitc312c4fdc88514dd9522b7858eb879e610aeb9b1 (patch)
treeab63777ca2eaafc9b46ce347bef1488c38794296 /fs/gfs2/lops.c
parentfe1a698ffef5af546dd4a8cd6a1f2f202491c4ef (diff)
[GFS2] Pass the correct value to kunmap_atomic
Pass kaddr rather than (incorrect) struct page to kunmap_atomic. Signed-off-by: Russell Cattelan <cattelan@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/lops.c')
-rw-r--r--fs/gfs2/lops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 881e337b6a70..ab6d1115f95d 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -492,7 +492,7 @@ static int gfs2_check_magic(struct buffer_head *bh)
492 ptr = kaddr + bh_offset(bh); 492 ptr = kaddr + bh_offset(bh);
493 if (*ptr == cpu_to_be32(GFS2_MAGIC)) 493 if (*ptr == cpu_to_be32(GFS2_MAGIC))
494 rv = 1; 494 rv = 1;
495 kunmap_atomic(page, KM_USER0); 495 kunmap_atomic(kaddr, KM_USER0);
496 496
497 return rv; 497 return rv;
498} 498}
@@ -626,7 +626,7 @@ static void databuf_lo_before_commit(struct gfs2_sbd *sdp)
626 memcpy(bh->b_data, 626 memcpy(bh->b_data,
627 kaddr + bh_offset(bd2->bd_bh), 627 kaddr + bh_offset(bd2->bd_bh),
628 sdp->sd_sb.sb_bsize); 628 sdp->sd_sb.sb_bsize);
629 kunmap_atomic(page, KM_USER0); 629 kunmap_atomic(kaddr, KM_USER0);
630 *(__be32 *)bh->b_data = 0; 630 *(__be32 *)bh->b_data = 0;
631 } else { 631 } else {
632 bh = gfs2_log_fake_buf(sdp, bd2->bd_bh); 632 bh = gfs2_log_fake_buf(sdp, bd2->bd_bh);