diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:27 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:21 -0400 |
commit | e8e3c3d66fd9d1ee2250f68d778cc48c1346d228 (patch) | |
tree | 2d69e1bb0cefe36bbfc4b75ddfa6cec8e72bcb98 /include/linux | |
parent | c6daa7ffa834c850b3dbb38af6980415caef680d (diff) |
fs: remove the second argument of k[un]map_atomic()
Acked-by: Benjamin LaHaise <bcrl@kvack.org>
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/bio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 129a9c097958..de5422a57511 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h | |||
@@ -101,10 +101,10 @@ static inline int bio_has_allocated_vec(struct bio *bio) | |||
101 | * I/O completely on that queue (see ide-dma for example) | 101 | * I/O completely on that queue (see ide-dma for example) |
102 | */ | 102 | */ |
103 | #define __bio_kmap_atomic(bio, idx, kmtype) \ | 103 | #define __bio_kmap_atomic(bio, idx, kmtype) \ |
104 | (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page, kmtype) + \ | 104 | (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) + \ |
105 | bio_iovec_idx((bio), (idx))->bv_offset) | 105 | bio_iovec_idx((bio), (idx))->bv_offset) |
106 | 106 | ||
107 | #define __bio_kunmap_atomic(addr, kmtype) kunmap_atomic(addr, kmtype) | 107 | #define __bio_kunmap_atomic(addr, kmtype) kunmap_atomic(addr) |
108 | 108 | ||
109 | /* | 109 | /* |
110 | * merge helpers etc | 110 | * merge helpers etc |
@@ -317,7 +317,7 @@ static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags) | |||
317 | * balancing is a lot nicer this way | 317 | * balancing is a lot nicer this way |
318 | */ | 318 | */ |
319 | local_irq_save(*flags); | 319 | local_irq_save(*flags); |
320 | addr = (unsigned long) kmap_atomic(bvec->bv_page, KM_BIO_SRC_IRQ); | 320 | addr = (unsigned long) kmap_atomic(bvec->bv_page); |
321 | 321 | ||
322 | BUG_ON(addr & ~PAGE_MASK); | 322 | BUG_ON(addr & ~PAGE_MASK); |
323 | 323 | ||
@@ -328,7 +328,7 @@ static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags) | |||
328 | { | 328 | { |
329 | unsigned long ptr = (unsigned long) buffer & PAGE_MASK; | 329 | unsigned long ptr = (unsigned long) buffer & PAGE_MASK; |
330 | 330 | ||
331 | kunmap_atomic((void *) ptr, KM_BIO_SRC_IRQ); | 331 | kunmap_atomic((void *) ptr); |
332 | local_irq_restore(*flags); | 332 | local_irq_restore(*flags); |
333 | } | 333 | } |
334 | 334 | ||