libcxgbi/cxgb4i : Fix ipv6 build failure caught with randconfig

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / scsi_transport_iscsi.c

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 0102a2d70dd85912db42f2beb1808cd6297f6bab..b481e62a12cc96945a937972f5c12ebaca488819 100644 (file)
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1780,7 +1780,7 @@ EXPORT_SYMBOL_GPL(iscsi_scan_finished);
 struct iscsi_scan_data {
        unsigned int channel;
        unsigned int id;
-       unsigned int lun;
+       u64 lun;
 };
 
 static int iscsi_user_scan_session(struct device *dev, void *data)
@@ -1827,7 +1827,7 @@ user_scan_exit:
 }
 
 static int iscsi_user_scan(struct Scsi_Host *shost, uint channel,
-                          uint id, uint lun)
+                          uint id, u64 lun)
 {
        struct iscsi_scan_data scan_data;
 
@@ -3059,7 +3059,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh)
                evchap->u.get_chap.host_no = ev->u.get_chap.host_no;
                evchap->u.get_chap.chap_tbl_idx = ev->u.get_chap.chap_tbl_idx;
                evchap->u.get_chap.num_entries = ev->u.get_chap.num_entries;
-               buf = (char *) ((char *)evchap + sizeof(*evchap));
+               buf = (char *)evchap + sizeof(*evchap);
                memset(buf, 0, chap_buf_size);
 
                err = transport->get_chap(shost, ev->u.get_chap.chap_tbl_idx,
@@ -3463,7 +3463,7 @@ iscsi_get_host_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
                evhost_stats->type = nlh->nlmsg_type;
                evhost_stats->u.get_host_stats.host_no =
                                        ev->u.get_host_stats.host_no;
-               buf = (char *)((char *)evhost_stats + sizeof(*evhost_stats));
+               buf = (char *)evhost_stats + sizeof(*evhost_stats);
                memset(buf, 0, host_stats_size);
 
                err = transport->get_host_stats(shost, buf, host_stats_size);