diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:23 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:19 -0400 |
commit | 77dfce076cbd76c04e90abff188d058cdbff78dd (patch) | |
tree | c2f1ac2dd386c68e6bf8dee8d996d0b6e36f9c73 /drivers/scsi/sd_dif.c | |
parent | 4679026d783eb5ac90247bc466d66b817b213abf (diff) |
scsi: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'drivers/scsi/sd_dif.c')
-rw-r--r-- | drivers/scsi/sd_dif.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c index f8fb2d691c0a..e52d5bc42bc4 100644 --- a/drivers/scsi/sd_dif.c +++ b/drivers/scsi/sd_dif.c | |||
@@ -392,7 +392,7 @@ int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_s | |||
392 | virt = bio->bi_integrity->bip_sector & 0xffffffff; | 392 | virt = bio->bi_integrity->bip_sector & 0xffffffff; |
393 | 393 | ||
394 | bip_for_each_vec(iv, bio->bi_integrity, i) { | 394 | bip_for_each_vec(iv, bio->bi_integrity, i) { |
395 | sdt = kmap_atomic(iv->bv_page, KM_USER0) | 395 | sdt = kmap_atomic(iv->bv_page) |
396 | + iv->bv_offset; | 396 | + iv->bv_offset; |
397 | 397 | ||
398 | for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) { | 398 | for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) { |
@@ -405,7 +405,7 @@ int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_s | |||
405 | phys++; | 405 | phys++; |
406 | } | 406 | } |
407 | 407 | ||
408 | kunmap_atomic(sdt, KM_USER0); | 408 | kunmap_atomic(sdt); |
409 | } | 409 | } |
410 | 410 | ||
411 | bio->bi_flags |= (1 << BIO_MAPPED_INTEGRITY); | 411 | bio->bi_flags |= (1 << BIO_MAPPED_INTEGRITY); |
@@ -414,7 +414,7 @@ int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_s | |||
414 | return 0; | 414 | return 0; |
415 | 415 | ||
416 | error: | 416 | error: |
417 | kunmap_atomic(sdt, KM_USER0); | 417 | kunmap_atomic(sdt); |
418 | sd_printk(KERN_ERR, sdkp, "%s: virt %u, phys %u, ref %u, app %4x\n", | 418 | sd_printk(KERN_ERR, sdkp, "%s: virt %u, phys %u, ref %u, app %4x\n", |
419 | __func__, virt, phys, be32_to_cpu(sdt->ref_tag), | 419 | __func__, virt, phys, be32_to_cpu(sdt->ref_tag), |
420 | be16_to_cpu(sdt->app_tag)); | 420 | be16_to_cpu(sdt->app_tag)); |
@@ -453,13 +453,13 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes) | |||
453 | virt = bio->bi_integrity->bip_sector & 0xffffffff; | 453 | virt = bio->bi_integrity->bip_sector & 0xffffffff; |
454 | 454 | ||
455 | bip_for_each_vec(iv, bio->bi_integrity, i) { | 455 | bip_for_each_vec(iv, bio->bi_integrity, i) { |
456 | sdt = kmap_atomic(iv->bv_page, KM_USER0) | 456 | sdt = kmap_atomic(iv->bv_page) |
457 | + iv->bv_offset; | 457 | + iv->bv_offset; |
458 | 458 | ||
459 | for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) { | 459 | for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) { |
460 | 460 | ||
461 | if (sectors == 0) { | 461 | if (sectors == 0) { |
462 | kunmap_atomic(sdt, KM_USER0); | 462 | kunmap_atomic(sdt); |
463 | return; | 463 | return; |
464 | } | 464 | } |
465 | 465 | ||
@@ -474,7 +474,7 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes) | |||
474 | sectors--; | 474 | sectors--; |
475 | } | 475 | } |
476 | 476 | ||
477 | kunmap_atomic(sdt, KM_USER0); | 477 | kunmap_atomic(sdt); |
478 | } | 478 | } |
479 | } | 479 | } |
480 | } | 480 | } |