2 files changed, 5 insertions, 5 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)
         ptr = kaddr + bh_offset(bh);
         if (*ptr == cpu_to_be32(GFS2_MAGIC))
                 rv = 1;
-        kunmap_atomic(page, KM_USER0);
+        kunmap_atomic(kaddr, KM_USER0);
 
         return rv;
 }
@@ -626,7 +626,7 @@ static void databuf_lo_before_commit(struct gfs2_sbd *sdp)
                                 memcpy(bh->b_data,
                                        kaddr + bh_offset(bd2->bd_bh),
                                        sdp->sd_sb.sb_bsize);
-                                kunmap_atomic(page, KM_USER0);
+                                kunmap_atomic(kaddr, KM_USER0);
                                 *(__be32 *)bh->b_data = 0;
                         } else {
                                 bh = gfs2_log_fake_buf(sdp, bd2->bd_bh);
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 99c933762eb2..e0599fed99ce 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -162,7 +162,7 @@ static int zero_readpage(struct page *page)
 
         kaddr = kmap_atomic(page, KM_USER0);
         memset(kaddr, 0, PAGE_CACHE_SIZE);
-        kunmap_atomic(page, KM_USER0);
+        kunmap_atomic(kaddr, KM_USER0);
 
         SetPageUptodate(page);
 
@@ -195,7 +195,7 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page)
         memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode),
                ip->i_di.di_size);
         memset(kaddr + ip->i_di.di_size, 0, PAGE_CACHE_SIZE - ip->i_di.di_size);
-        kunmap_atomic(page, KM_USER0);
+        kunmap_atomic(kaddr, KM_USER0);
 
         brelse(dibh);
 
@@ -485,7 +485,7 @@ static int gfs2_commit_write(struct file *file, struct page *page,
                 kaddr = kmap_atomic(page, KM_USER0);
                 memcpy(dibh->b_data + sizeof(struct gfs2_dinode) + from,
                        kaddr + from, to - from);
-                kunmap_atomic(page, KM_USER0);
+                kunmap_atomic(kaddr, KM_USER0);
 
                 SetPageUptodate(page);