diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:30 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:23 -0400 |
commit | d93492855ff307ce9d699e36d966af3420b80bb3 (patch) | |
tree | 796d1ab910796675960c780d128477cf97b9a4bb /fs/gfs2/aops.c | |
parent | 2408f6ef6bf58620f8330b37181d2bdca2e7c7c5 (diff) |
gfs2: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'fs/gfs2/aops.c')
-rw-r--r-- | fs/gfs2/aops.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 501e5cba09b3..38b7a74a0f91 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c | |||
@@ -434,12 +434,12 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) | |||
434 | if (error) | 434 | if (error) |
435 | return error; | 435 | return error; |
436 | 436 | ||
437 | kaddr = kmap_atomic(page, KM_USER0); | 437 | kaddr = kmap_atomic(page); |
438 | if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode))) | 438 | if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode))) |
439 | dsize = (dibh->b_size - sizeof(struct gfs2_dinode)); | 439 | dsize = (dibh->b_size - sizeof(struct gfs2_dinode)); |
440 | memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize); | 440 | memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize); |
441 | memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize); | 441 | memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize); |
442 | kunmap_atomic(kaddr, KM_USER0); | 442 | kunmap_atomic(kaddr); |
443 | flush_dcache_page(page); | 443 | flush_dcache_page(page); |
444 | brelse(dibh); | 444 | brelse(dibh); |
445 | SetPageUptodate(page); | 445 | SetPageUptodate(page); |
@@ -542,9 +542,9 @@ int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state, | |||
542 | page = read_cache_page(mapping, index, __gfs2_readpage, NULL); | 542 | page = read_cache_page(mapping, index, __gfs2_readpage, NULL); |
543 | if (IS_ERR(page)) | 543 | if (IS_ERR(page)) |
544 | return PTR_ERR(page); | 544 | return PTR_ERR(page); |
545 | p = kmap_atomic(page, KM_USER0); | 545 | p = kmap_atomic(page); |
546 | memcpy(buf + copied, p + offset, amt); | 546 | memcpy(buf + copied, p + offset, amt); |
547 | kunmap_atomic(p, KM_USER0); | 547 | kunmap_atomic(p); |
548 | mark_page_accessed(page); | 548 | mark_page_accessed(page); |
549 | page_cache_release(page); | 549 | page_cache_release(page); |
550 | copied += amt; | 550 | copied += amt; |
@@ -788,11 +788,11 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, | |||
788 | unsigned char *buf = dibh->b_data + sizeof(struct gfs2_dinode); | 788 | unsigned char *buf = dibh->b_data + sizeof(struct gfs2_dinode); |
789 | 789 | ||
790 | BUG_ON((pos + len) > (dibh->b_size - sizeof(struct gfs2_dinode))); | 790 | BUG_ON((pos + len) > (dibh->b_size - sizeof(struct gfs2_dinode))); |
791 | kaddr = kmap_atomic(page, KM_USER0); | 791 | kaddr = kmap_atomic(page); |
792 | memcpy(buf + pos, kaddr + pos, copied); | 792 | memcpy(buf + pos, kaddr + pos, copied); |
793 | memset(kaddr + pos + copied, 0, len - copied); | 793 | memset(kaddr + pos + copied, 0, len - copied); |
794 | flush_dcache_page(page); | 794 | flush_dcache_page(page); |
795 | kunmap_atomic(kaddr, KM_USER0); | 795 | kunmap_atomic(kaddr); |
796 | 796 | ||
797 | if (!PageUptodate(page)) | 797 | if (!PageUptodate(page)) |
798 | SetPageUptodate(page); | 798 | SetPageUptodate(page); |