Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / include / scsi / iscsi_if.h

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index be1bc792ab181f83c95536505e87468c7604777a..e5618b90996e9a4c4e9eba4e06d105c8674e55bd 100644 (file)
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -163,11 +163,14 @@ enum iscsi_param {
 };
 #define ISCSI_PARAM_MAX                        14
 
-typedef uint64_t iscsi_sessionh_t;     /* iSCSI Data-Path session handle */
-typedef uint64_t iscsi_connh_t;                /* iSCSI Data-Path connection handle */
-
 #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle)
 #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr)
+#define hostdata_session(_hostdata) (iscsi_ptr(*(unsigned long *)_hostdata))
+
+/**
+ * iscsi_hostdata - get LLD hostdata from scsi_host
+ * @_hostdata: pointer to scsi host's hostdata
+ **/
 #define iscsi_hostdata(_hostdata) ((void*)_hostdata + sizeof(unsigned long))
 
 /*