diff options
Diffstat (limited to 'fs/gfs2/lops.c')
| -rw-r--r-- | fs/gfs2/lops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index 0301be655b12..df7c6e8d0764 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c | |||
| @@ -553,11 +553,11 @@ static void gfs2_check_magic(struct buffer_head *bh) | |||
| 553 | __be32 *ptr; | 553 | __be32 *ptr; |
| 554 | 554 | ||
| 555 | clear_buffer_escaped(bh); | 555 | clear_buffer_escaped(bh); |
| 556 | kaddr = kmap_atomic(bh->b_page, KM_USER0); | 556 | kaddr = kmap_atomic(bh->b_page); |
| 557 | ptr = kaddr + bh_offset(bh); | 557 | ptr = kaddr + bh_offset(bh); |
| 558 | if (*ptr == cpu_to_be32(GFS2_MAGIC)) | 558 | if (*ptr == cpu_to_be32(GFS2_MAGIC)) |
| 559 | set_buffer_escaped(bh); | 559 | set_buffer_escaped(bh); |
| 560 | kunmap_atomic(kaddr, KM_USER0); | 560 | kunmap_atomic(kaddr); |
| 561 | } | 561 | } |
| 562 | 562 | ||
| 563 | static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh, | 563 | static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh, |
| @@ -594,10 +594,10 @@ static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh, | |||
| 594 | if (buffer_escaped(bd->bd_bh)) { | 594 | if (buffer_escaped(bd->bd_bh)) { |
| 595 | void *kaddr; | 595 | void *kaddr; |
| 596 | bh1 = gfs2_log_get_buf(sdp); | 596 | bh1 = gfs2_log_get_buf(sdp); |
| 597 | kaddr = kmap_atomic(bd->bd_bh->b_page, KM_USER0); | 597 | kaddr = kmap_atomic(bd->bd_bh->b_page); |
| 598 | memcpy(bh1->b_data, kaddr + bh_offset(bd->bd_bh), | 598 | memcpy(bh1->b_data, kaddr + bh_offset(bd->bd_bh), |
| 599 | bh1->b_size); | 599 | bh1->b_size); |
| 600 | kunmap_atomic(kaddr, KM_USER0); | 600 | kunmap_atomic(kaddr); |
| 601 | *(__be32 *)bh1->b_data = 0; | 601 | *(__be32 *)bh1->b_data = 0; |
| 602 | clear_buffer_escaped(bd->bd_bh); | 602 | clear_buffer_escaped(bd->bd_bh); |
| 603 | unlock_buffer(bd->bd_bh); | 603 | unlock_buffer(bd->bd_bh); |