mirror of
https://github.com/SCST-project/scst.git
synced 2026-08-18 13:16:34 +00:00
Merge branch 'svn-trunk'
This commit is contained in:
+3
-1
@@ -348,7 +348,9 @@ int ft_get_transport_id(struct scst_tgt *tgt, struct scst_session *scst_sess,
|
||||
u8 __resv1[7];
|
||||
__be64 port_name; /* N_Port Name */
|
||||
u8 __resv2[8];
|
||||
} __attribute__((__packed__)) *id;
|
||||
} *id;
|
||||
|
||||
static_assert(sizeof(*id) == 24);
|
||||
|
||||
if (!scst_sess)
|
||||
return SCSI_TRANSPORTID_PROTOCOLID_FCP2;
|
||||
|
||||
@@ -269,8 +269,8 @@ struct isert_global {
|
||||
struct workqueue_struct *conn_wq;
|
||||
};
|
||||
|
||||
#define _ptr_to_u64(p) (u64)(unsigned long)(p)
|
||||
#define _u64_to_ptr(v) (void *)(unsigned long)(v)
|
||||
#define _ptr_to_u64(p) ((u64)(unsigned long)(p))
|
||||
#define _u64_to_ptr(v) ((void *)(unsigned long)(v))
|
||||
|
||||
/* global iser scope */
|
||||
int isert_global_init(void);
|
||||
|
||||
Reference in New Issue
Block a user