projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] remove Scsi_Device typedef
[powerpc.git]
/
drivers
/
scsi
/
scsi_transport_iscsi.c
diff --git
a/drivers/scsi/scsi_transport_iscsi.c
b/drivers/scsi/scsi_transport_iscsi.c
index
f189ce7
..
49fd18c
100644
(file)
--- a/
drivers/scsi/scsi_transport_iscsi.c
+++ b/
drivers/scsi/scsi_transport_iscsi.c
@@
-21,8
+21,11
@@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <linux/module.h>
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <linux/mempool.h>
#include <net/tcp.h>
#include <linux/mempool.h>
#include <net/tcp.h>
+
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_device.h>
@@
-97,7
+100,7
@@
static ssize_t
show_transport_handle(struct class_device *cdev, char *buf)
{
struct iscsi_internal *priv = cdev_to_iscsi_internal(cdev);
show_transport_handle(struct class_device *cdev, char *buf)
{
struct iscsi_internal *priv = cdev_to_iscsi_internal(cdev);
- return sprintf(buf, "%llu", (unsigned long long)iscsi_handle(priv->iscsi_transport));
+ return sprintf(buf, "%llu
\n
", (unsigned long long)iscsi_handle(priv->iscsi_transport));
}
static CLASS_DEVICE_ATTR(handle, S_IRUGO, show_transport_handle, NULL);
}
static CLASS_DEVICE_ATTR(handle, S_IRUGO, show_transport_handle, NULL);
@@
-1230,7
+1233,8
@@
static __init int iscsi_transport_init(void)
if (err)
goto unregister_session_class;
if (err)
goto unregister_session_class;
- nls = netlink_kernel_create(NETLINK_ISCSI, iscsi_if_rx);
+ nls = netlink_kernel_create(NETLINK_ISCSI, 1, iscsi_if_rx,
+ THIS_MODULE);
if (!nls) {
err = -ENOBUFS;
goto unregister_notifier;
if (!nls) {
err = -ENOBUFS;
goto unregister_notifier;