tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

gfs2: remove the second argument of k[un]map_atomic()

Signed-off-by: Cong Wang <amwang@redhat.com>

authored by

Cong Wang and committed by
Cong Wang d9349285 2408f6ef

+12 -12
+6 -6
fs/gfs2/aops.c
··· 434 434 if (error) 435 435 return error; 436 436 437 - kaddr = kmap_atomic(page, KM_USER0); 437 + kaddr = kmap_atomic(page); 438 438 if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode))) 439 439 dsize = (dibh->b_size - sizeof(struct gfs2_dinode)); 440 440 memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize); 441 441 memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize); 442 - kunmap_atomic(kaddr, KM_USER0); 442 + kunmap_atomic(kaddr); 443 443 flush_dcache_page(page); 444 444 brelse(dibh); 445 445 SetPageUptodate(page); ··· 542 542 page = read_cache_page(mapping, index, __gfs2_readpage, NULL); 543 543 if (IS_ERR(page)) 544 544 return PTR_ERR(page); 545 - p = kmap_atomic(page, KM_USER0); 545 + p = kmap_atomic(page); 546 546 memcpy(buf + copied, p + offset, amt); 547 - kunmap_atomic(p, KM_USER0); 547 + kunmap_atomic(p); 548 548 mark_page_accessed(page); 549 549 page_cache_release(page); 550 550 copied += amt; ··· 788 788 unsigned char *buf = dibh->b_data + sizeof(struct gfs2_dinode); 789 789 790 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 792 memcpy(buf + pos, kaddr + pos, copied); 793 793 memset(kaddr + pos + copied, 0, len - copied); 794 794 flush_dcache_page(page); 795 - kunmap_atomic(kaddr, KM_USER0); 795 + kunmap_atomic(kaddr); 796 796 797 797 if (!PageUptodate(page)) 798 798 SetPageUptodate(page);
+4 -4
fs/gfs2/lops.c
··· 553 553 __be32 *ptr; 554 554 555 555 clear_buffer_escaped(bh); 556 - kaddr = kmap_atomic(bh->b_page, KM_USER0); 556 + kaddr = kmap_atomic(bh->b_page); 557 557 ptr = kaddr + bh_offset(bh); 558 558 if (*ptr == cpu_to_be32(GFS2_MAGIC)) 559 559 set_buffer_escaped(bh); 560 - kunmap_atomic(kaddr, KM_USER0); 560 + kunmap_atomic(kaddr); 561 561 } 562 562 563 563 static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh, ··· 594 594 if (buffer_escaped(bd->bd_bh)) { 595 595 void *kaddr; 596 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 598 memcpy(bh1->b_data, kaddr + bh_offset(bd->bd_bh), 599 599 bh1->b_size); 600 - kunmap_atomic(kaddr, KM_USER0); 600 + kunmap_atomic(kaddr); 601 601 *(__be32 *)bh1->b_data = 0; 602 602 clear_buffer_escaped(bd->bd_bh); 603 603 unlock_buffer(bd->bd_bh);
+2 -2
fs/gfs2/quota.c
··· 720 720 721 721 gfs2_trans_add_bh(ip->i_gl, bh, 0); 722 722 723 - kaddr = kmap_atomic(page, KM_USER0); 723 + kaddr = kmap_atomic(page); 724 724 if (offset + sizeof(struct gfs2_quota) > PAGE_CACHE_SIZE) 725 725 nbytes = PAGE_CACHE_SIZE - offset; 726 726 memcpy(kaddr + offset, ptr, nbytes); 727 727 flush_dcache_page(page); 728 - kunmap_atomic(kaddr, KM_USER0); 728 + kunmap_atomic(kaddr); 729 729 unlock_page(page); 730 730 page_cache_release(page); 731 731