X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fs390%2Fscsi%2Fzfcp_aux.c;h=4f4fd5a8eea7aebe2b0bb9724bf896428d060a60;hb=f9296eb00ed30209424102d3c920e69617eea853;hp=dad02890ef01e82d9d6f8f29bef693c2233e8a05;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index dad02890e..4f4fd5a8e 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -29,7 +29,7 @@
  */
 
 /* this drivers version (do not edit !!! generated and updated by cvs) */
-#define ZFCP_AUX_REVISION "$Revision: 1.115 $"
+#define ZFCP_AUX_REVISION "$Revision: 1.108 $"
 
 #include "zfcp_ext.h"
 
@@ -41,6 +41,8 @@ static char *device;
 /* written against the module interface */
 static int __init  zfcp_module_init(void);
 
+int zfcp_reboot_handler(struct notifier_block *, unsigned long, void *);
+
 /* FCP related */
 static void zfcp_ns_gid_pn_handler(unsigned long);
 
@@ -308,10 +310,6 @@ zfcp_module_init(void)
 	/* initialize adapters to be removed list head */
 	INIT_LIST_HEAD(&zfcp_data.adapter_remove_lh);
 
-	zfcp_transport_template = fc_attach_transport(&zfcp_transport_functions);
-	if (!zfcp_transport_template)
-		return -ENODEV;
-
 #ifdef CONFIG_S390_SUPPORT
 	retval = register_ioctl32_conversion(zfcp_ioctl_trans.cmd,
 					     zfcp_ioctl_trans.handler);
@@ -336,6 +334,9 @@ zfcp_module_init(void)
 	/* initialise configuration rw lock */
 	rwlock_init(&zfcp_data.config_lock);
 
+	zfcp_data.reboot_notifier.notifier_call = zfcp_reboot_handler;
+	register_reboot_notifier(&zfcp_data.reboot_notifier);
+
 	/* save address of data structure managing the driver module */
 	zfcp_data.scsi_host_template.module = THIS_MODULE;
 
@@ -352,6 +353,7 @@ zfcp_module_init(void)
 	goto out;
 
  out_ccw_register:
+	unregister_reboot_notifier(&zfcp_data.reboot_notifier);
 	misc_deregister(&zfcp_cfdc_misc);
  out_misc_register:
 #ifdef CONFIG_S390_SUPPORT
@@ -363,6 +365,23 @@ zfcp_module_init(void)
 	return retval;
 }
 
+/*
+ * This function is called automatically by the kernel whenever a reboot or a 
+ * shut-down is initiated and zfcp is still loaded
+ *
+ * locks:       zfcp_data.config_sema is taken prior to shutting down the module
+ *              and removing all structures
+ * returns:     NOTIFY_DONE in all cases
+ */
+int
+zfcp_reboot_handler(struct notifier_block *notifier, unsigned long code,
+		    void *ptr)
+{
+	zfcp_ccw_unregister();
+	return NOTIFY_DONE;
+}
+
+
 /*
  * function:    zfcp_cfdc_dev_ioctl
  *
@@ -395,7 +414,7 @@ zfcp_cfdc_dev_ioctl(struct inode *inode, struct file *file,
 		retval = -ENOMEM;
 		goto out;
 	}
-	memset(sg_list, 0, sizeof(*sg_list));
+	sg_list->count = 0;
 
 	if (command != ZFCP_CFDC_IOC) {
 		ZFCP_LOG_INFO("IOC request code 0x%x invalid\n", command);
@@ -580,7 +599,6 @@ zfcp_sg_list_alloc(struct zfcp_sg_list *sg_list, size_t size)
 	sg_list->sg = kmalloc(sg_list->count * sizeof(struct scatterlist),
 			      GFP_KERNEL);
 	if (sg_list->sg == NULL) {
-		sg_list->count = 0;
 		retval = -ENOMEM;
 		goto out;
 	}
@@ -617,13 +635,11 @@ zfcp_sg_list_free(struct zfcp_sg_list *sg_list)
 	unsigned int i;
 	int retval = 0;
 
-	BUG_ON(sg_list == NULL);
+	BUG_ON((sg_list->sg == NULL) || (sg_list == NULL));
 
 	for (i = 0, sg = sg_list->sg; i < sg_list->count; i++, sg++)
 		__free_pages(sg->page, 0);
 
-	kfree(sg_list->sg);
-
 	return retval;
 }