4 files changed, 11 insertions, 14 deletions

diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index f607314810ac..f7357308655a 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -485,11 +485,11 @@ static void fc_fcp_recv_data(struct fc_fcp_pkt *fsp, struct fc_frame *fp)
 
         if (!(fr_flags(fp) & FCPHF_CRC_UNCHECKED)) {
                 copy_len = fc_copy_buffer_to_sglist(buf, len, sg, &nents,
-                                                    &offset, KM_SOFTIRQ0, NULL);
+                                                    &offset, NULL);
         } else {
                 crc = crc32(~0, (u8 *) fh, sizeof(*fh));
                 copy_len = fc_copy_buffer_to_sglist(buf, len, sg, &nents,
-                                                    &offset, KM_SOFTIRQ0, &crc);
+                                                    &offset, &crc);
                 buf = fc_frame_payload_get(fp, 0);
                 if (len % 4)
                         crc = crc32(crc, buf + len, 4 - (len % 4));
@@ -650,10 +650,10 @@ static int fc_fcp_send_data(struct fc_fcp_pkt *fsp, struct fc_seq *seq,
                          * The scatterlist item may be bigger than PAGE_SIZE,
                          * but we must not cross pages inside the kmap.
                          */
-                        page_addr = kmap_atomic(page, KM_SOFTIRQ0);
+                        page_addr = kmap_atomic(page);
                         memcpy(data, (char *)page_addr + (off & ~PAGE_MASK),
                                sg_bytes);
-                        kunmap_atomic(page_addr, KM_SOFTIRQ0);
+                        kunmap_atomic(page_addr);
                         data += sg_bytes;
                 }
                 offset += sg_bytes;
@@ -1074,8 +1074,7 @@ static int fc_fcp_pkt_send(struct fc_lport *lport, struct fc_fcp_pkt *fsp)
         fsp->cdb_cmd.fc_dl = htonl(fsp->data_len);
         fsp->cdb_cmd.fc_flags = fsp->req_flags & ~FCP_CFL_LEN_MASK;
 
-        int_to_scsilun(fsp->cmd->device->lun,
-                       (struct scsi_lun *)fsp->cdb_cmd.fc_lun);
+        int_to_scsilun(fsp->cmd->device->lun, &fsp->cdb_cmd.fc_lun);
         memcpy(fsp->cdb_cmd.fc_cdb, fsp->cmd->cmnd, fsp->cmd->cmd_len);
 
         spin_lock_irqsave(&si->scsi_queue_lock, flags);
@@ -1257,7 +1256,7 @@ static int fc_lun_reset(struct fc_lport *lport, struct fc_fcp_pkt *fsp,
 
         fsp->cdb_cmd.fc_dl = htonl(fsp->data_len);
         fsp->cdb_cmd.fc_tm_flags = FCP_TMF_LUN_RESET;
-        int_to_scsilun(lun, (struct scsi_lun *)fsp->cdb_cmd.fc_lun);
+        int_to_scsilun(lun, &fsp->cdb_cmd.fc_lun);
 
         fsp->wait_for_comp = 1;
         init_completion(&fsp->tm_done);
diff --git a/drivers/scsi/libfc/fc_libfc.c b/drivers/scsi/libfc/fc_libfc.c
index 1bf9841ef154..8d65a51a7598 100644
--- a/drivers/scsi/libfc/fc_libfc.c
+++ b/drivers/scsi/libfc/fc_libfc.c
@@ -105,14 +105,13 @@ module_exit(libfc_exit);
  * @sg: pointer to the pointer of the SG list.
  * @nents: pointer to the remaining number of entries in the SG list.
  * @offset: pointer to the current offset in the SG list.
- * @km_type: dedicated page table slot type for kmap_atomic.
  * @crc: pointer to the 32-bit crc value.
  *       If crc is NULL, CRC is not calculated.
  */
 u32 fc_copy_buffer_to_sglist(void *buf, size_t len,
                              struct scatterlist *sg,
                              u32 *nents, size_t *offset,
-                             enum km_type km_type, u32 *crc)
+                             u32 *crc)
 {
         size_t remaining = len;
         u32 copy_len = 0;
@@ -142,12 +141,11 @@ u32 fc_copy_buffer_to_sglist(void *buf, size_t len,
                 off = *offset + sg->offset;
                 sg_bytes = min(sg_bytes,
                                (size_t)(PAGE_SIZE - (off & ~PAGE_MASK)));
-                page_addr = kmap_atomic(sg_page(sg) + (off >> PAGE_SHIFT),
-                                        km_type);
+                page_addr = kmap_atomic(sg_page(sg) + (off >> PAGE_SHIFT));
                 if (crc)
                         *crc = crc32(*crc, buf, sg_bytes);
                 memcpy((char *)page_addr + (off & ~PAGE_MASK), buf, sg_bytes);
-                kunmap_atomic(page_addr, km_type);
+                kunmap_atomic(page_addr);
                 buf += sg_bytes;
                 *offset += sg_bytes;
                 remaining -= sg_bytes;
diff --git a/drivers/scsi/libfc/fc_libfc.h b/drivers/scsi/libfc/fc_libfc.h
index c7d071289af5..c2830cc66d6a 100644
--- a/drivers/scsi/libfc/fc_libfc.h
+++ b/drivers/scsi/libfc/fc_libfc.h
@@ -134,6 +134,6 @@ extern void fc_fc4_conf_lport_params(struct fc_lport *, enum fc_fh_type);
 u32 fc_copy_buffer_to_sglist(void *buf, size_t len,
                              struct scatterlist *sg,
                              u32 *nents, size_t *offset,
-                             enum km_type km_type, u32 *crc);
+                             u32 *crc);
 
 #endif /* _FC_LIBFC_H_ */
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 9a0b2a9caad6..bd5d31d022d9 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -1919,7 +1919,7 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp,
 
         job->reply->reply_payload_rcv_len +=
                 fc_copy_buffer_to_sglist(buf, len, info->sg, &info->nents,
-                                         &info->offset, KM_BIO_SRC_IRQ, NULL);
+                                         &info->offset, NULL);
 
         if (fr_eof(fp) == FC_EOF_T &&
             (ntoh24(fh->fh_f_ctl) & (FC_FC_LAST_SEQ | FC_FC_END_SEQ)) ==