projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[cascardo/linux.git]
/
drivers
/
target
/
target_core_fabric_lib.c
diff --git
a/drivers/target/target_core_fabric_lib.c
b/drivers/target/target_core_fabric_lib.c
index
ec4249b
..
283a36e
100644
(file)
--- a/
drivers/target/target_core_fabric_lib.c
+++ b/
drivers/target/target_core_fabric_lib.c
@@
-34,13
+34,10
@@
#include <scsi/scsi_cmnd.h>
#include <target/target_core_base.h>
#include <scsi/scsi_cmnd.h>
#include <target/target_core_base.h>
-#include <target/target_core_device.h>
-#include <target/target_core_transport.h>
-#include <target/target_core_fabric_lib.h>
-#include <target/target_core_fabric_ops.h>
+#include <target/target_core_fabric.h>
#include <target/target_core_configfs.h>
#include <target/target_core_configfs.h>
-#include "target_core_
hba
.h"
+#include "target_core_
internal
.h"
#include "target_core_pr.h"
/*
#include "target_core_pr.h"
/*
@@
-402,7
+399,7
@@
char *iscsi_parse_pr_out_transport_id(
add_len = ((buf[2] >> 8) & 0xff);
add_len |= (buf[3] & 0xff);
add_len = ((buf[2] >> 8) & 0xff);
add_len |= (buf[3] & 0xff);
- tid_len = strlen(
(char *)
&buf[4]);
+ tid_len = strlen(&buf[4]);
tid_len += 4; /* Add four bytes for iSCSI Transport ID header */
tid_len += 1; /* Add one byte for NULL terminator */
padding = ((-tid_len) & 3);
tid_len += 4; /* Add four bytes for iSCSI Transport ID header */
tid_len += 1; /* Add one byte for NULL terminator */
padding = ((-tid_len) & 3);
@@
-423,11
+420,11
@@
char *iscsi_parse_pr_out_transport_id(
* format.
*/
if (format_code == 0x40) {
* format.
*/
if (format_code == 0x40) {
- p = strstr(
(char *)
&buf[4], ",i,0x");
+ p = strstr(&buf[4], ",i,0x");
if (!p) {
pr_err("Unable to locate \",i,0x\" seperator"
" for Initiator port identifier: %s\n",
if (!p) {
pr_err("Unable to locate \",i,0x\" seperator"
" for Initiator port identifier: %s\n",
-
(char *)
&buf[4]);
+ &buf[4]);
return NULL;
}
*p = '\0'; /* Terminate iSCSI Name */
return NULL;
}
*p = '\0'; /* Terminate iSCSI Name */