diff options
author | Russell Cattelan <cattelan@redhat.com> | 2006-10-12 09:23:41 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-12 17:11:13 -0400 |
commit | c312c4fdc88514dd9522b7858eb879e610aeb9b1 (patch) | |
tree | ab63777ca2eaafc9b46ce347bef1488c38794296 /fs/gfs2/ops_address.c | |
parent | fe1a698ffef5af546dd4a8cd6a1f2f202491c4ef (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/ops_address.c')
-rw-r--r-- | fs/gfs2/ops_address.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index 99c933762eb..e0599fed99c 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c | |||
@@ -162,7 +162,7 @@ static int zero_readpage(struct page *page) | |||
162 | 162 | ||
163 | kaddr = kmap_atomic(page, KM_USER0); | 163 | kaddr = kmap_atomic(page, KM_USER0); |
164 | memset(kaddr, 0, PAGE_CACHE_SIZE); | 164 | memset(kaddr, 0, PAGE_CACHE_SIZE); |
165 | kunmap_atomic(page, KM_USER0); | 165 | kunmap_atomic(kaddr, KM_USER0); |
166 | 166 | ||
167 | SetPageUptodate(page); | 167 | SetPageUptodate(page); |
168 | 168 | ||
@@ -195,7 +195,7 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) | |||
195 | memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), | 195 | memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), |
196 | ip->i_di.di_size); | 196 | ip->i_di.di_size); |
197 | memset(kaddr + ip->i_di.di_size, 0, PAGE_CACHE_SIZE - ip->i_di.di_size); | 197 | memset(kaddr + ip->i_di.di_size, 0, PAGE_CACHE_SIZE - ip->i_di.di_size); |
198 | kunmap_atomic(page, KM_USER0); | 198 | kunmap_atomic(kaddr, KM_USER0); |
199 | 199 | ||
200 | brelse(dibh); | 200 | brelse(dibh); |
201 | 201 | ||
@@ -485,7 +485,7 @@ static int gfs2_commit_write(struct file *file, struct page *page, | |||
485 | kaddr = kmap_atomic(page, KM_USER0); | 485 | kaddr = kmap_atomic(page, KM_USER0); |
486 | memcpy(dibh->b_data + sizeof(struct gfs2_dinode) + from, | 486 | memcpy(dibh->b_data + sizeof(struct gfs2_dinode) + from, |
487 | kaddr + from, to - from); | 487 | kaddr + from, to - from); |
488 | kunmap_atomic(page, KM_USER0); | 488 | kunmap_atomic(kaddr, KM_USER0); |
489 | 489 | ||
490 | SetPageUptodate(page); | 490 | SetPageUptodate(page); |
491 | 491 | ||