Pass the correct value to kunmap_atomic
PATCH 5/7 Pass the correct value to kunmap_atomic
Quoted 1 line
From
c312c4fdc88514dd9522b7858eb879e610aeb9b1Mon Sep 17 00:00:00 2001
From: Russell Cattelan <[email protected]>
Date: Thu, 12 Oct 2006 09:23:41 -0400
Subject: [GFS2] Pass the correct value to kunmap_atomic
Pass kaddr rather than (incorrect) struct page to kunmap_atomic.
Signed-off-by Russell Cattelan <[email protected]>
Signed-off-by Steven Whitehouse <[email protected]>
--- fs/gfs2/lops.c | 4 ++-- fs/gfs2/ops_address.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
fs/gfs2/lops.c +2 -2
@@ -492,7 +492,7 @@ static int gfs2_check_magic(struct buffe 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(strmemcpy (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);
fs/gfs2/ops_address.c +3 -3
@@ -162,7 +162,7 @@ static int zero_readpage(struct page *pa 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_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 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);
Signature · 1 line
1.4.1