tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] zfcp: bugfix and compile fixes

Bugfix (usage of uninitialized pointer in zfcp_port_dequeue) and compile
fixes for the zfcp device driver.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Heiko Carstens and committed by
Linus Torvalds 20b1730a 7f84f226

+3 -4
+2 -3
drivers/s390/scsi/zfcp_aux.c
··· 1403 1403 void 1404 1404 zfcp_port_dequeue(struct zfcp_port *port) 1405 1405 { 1406 - struct fc_port *rport; 1407 - 1408 1406 zfcp_port_wait(port); 1409 1407 write_lock_irq(&zfcp_data.config_lock); 1410 1408 list_del(&port->list); 1411 1409 port->adapter->ports--; 1412 1410 write_unlock_irq(&zfcp_data.config_lock); 1413 1411 if (port->rport) 1414 - fc_remote_port_delete(rport); 1412 + fc_remote_port_delete(port->rport); 1413 + port->rport = NULL; 1415 1414 zfcp_adapter_put(port->adapter); 1416 1415 zfcp_sysfs_port_remove_files(&port->sysfs_device, 1417 1416 atomic_read(&port->status));
+1 -1
drivers/s390/scsi/zfcp_ccw.c
··· 203 203 { 204 204 struct zfcp_adapter *adapter; 205 205 struct zfcp_port *port; 206 - struct fc_port *rport; 206 + struct fc_rport *rport; 207 207 208 208 down(&zfcp_data.config_sema); 209 209 adapter = dev_get_drvdata(&ccw_device->dev);