Commit:     1b9c12ba2fdf802a23630f70eddb0e821296634e
Parent:     05cca7381429e12d66c5b5c8b5c5848055b88bf7
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 26 17:43:23 2008 +0100
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Sat Feb 16 15:40:32 2008 +0100

    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
    Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
 drivers/firewire/fw-sbp2.c |    6 +++++-
 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
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to