aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-01-26 17:43:23 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-02-16 15:40:32 +0100
commit1b9c12ba2fdf802a23630f70eddb0e821296634e (patch)
treef581394b4d7b297619f4f0a62c490e57480fd3ec /drivers/firewire
parent05cca7381429e12d66c5b5c8b5c5848055b88bf7 (diff)
downloadkernel_samsung_smdk4412-1b9c12ba2fdf802a23630f70eddb0e821296634e.zip
kernel_samsung_smdk4412-1b9c12ba2fdf802a23630f70eddb0e821296634e.tar.gz
kernel_samsung_smdk4412-1b9c12ba2fdf802a23630f70eddb0e821296634e.tar.bz2
firewire: fw-sbp2: fix logout before login retry
This fixes a "can't recognize device" kind of bug. If the SCSI INQUIRY failed and hence __scsi_add_device failed due to a bus reset, we tried a logout and then waited for the already scheduled login work to happen. So far so good, but the generation used for the logout was outdated, hence the logout never reached the target. The target might therefore deny the subsequent relogin attempt, which would also leave the target inaccessible. Therefore fetch a fresh device->generation for the logout. Use memory barriers to prevent our plan being foiled by compiler or hardware optimizations. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-sbp2.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index f2a9a33..a15e3c7 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -716,7 +716,11 @@ static void sbp2_login(struct work_struct *work)
sdev = __scsi_add_device(shost, 0, 0,
scsilun_to_int(&eight_bytes_lun), lu);
if (IS_ERR(sdev)) {
- sbp2_send_management_orb(lu, node_id, generation,
+ smp_rmb(); /* generation may have changed */
+ generation = device->generation;
+ smp_rmb(); /* node_id must not be older than generation */
+
+ sbp2_send_management_orb(lu, device->node_id, generation,
SBP2_LOGOUT_REQUEST, lu->login_id, NULL);
/*
* Set this back to sbp2_login so we fall back and