aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-01-23 19:53:19 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-01-30 16:22:26 -0500
commit5a8a1bcd15dfb9f177f3605fe6b9ba2bef2bf55a (patch)
treef74aad717dc774991e866400179c90064e6eaa0d /drivers/firewire
parent14dc992aa782f8759c6d117d4322db62f62600ce (diff)
firewire: fw-sbp2: use device generation, not card generation
There was a small window where a login or reconnect job could use an already updated card generation with an outdated node ID. We have to use the fw_device.generation here, not the fw_card.generation, because the generation must never be newer than the node ID when we emit a transaction. This cannot be guaranteed with fw_card.generation. Furthermore, the target's and initiator's node IDs can be obtained from fw_device and fw_card. Dereferencing their underlying topology objects is not necessary. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Verified in concert with subsequent memory barriers patch to fix 'giving up on config rom' issues on multiple system and drive combinations that were previously affected. Signed-off-by: Jarod Wilson <jwilson@redhat.com>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-sbp2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index d2fbfc6f6d8a..d406c34fd378 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -661,9 +661,9 @@ static void sbp2_login(struct work_struct *work)
661 struct sbp2_login_response response; 661 struct sbp2_login_response response;
662 int generation, node_id, local_node_id; 662 int generation, node_id, local_node_id;
663 663
664 generation = device->card->generation; 664 generation = device->generation;
665 node_id = device->node->node_id; 665 node_id = device->node_id;
666 local_node_id = device->card->local_node->node_id; 666 local_node_id = device->card->node_id;
667 667
668 if (sbp2_send_management_orb(lu, node_id, generation, 668 if (sbp2_send_management_orb(lu, node_id, generation,
669 SBP2_LOGIN_REQUEST, lu->lun, &response) < 0) { 669 SBP2_LOGIN_REQUEST, lu->lun, &response) < 0) {
@@ -911,9 +911,9 @@ static void sbp2_reconnect(struct work_struct *work)
911 struct fw_device *device = fw_device(unit->device.parent); 911 struct fw_device *device = fw_device(unit->device.parent);
912 int generation, node_id, local_node_id; 912 int generation, node_id, local_node_id;
913 913
914 generation = device->card->generation; 914 generation = device->generation;
915 node_id = device->node->node_id; 915 node_id = device->node_id;
916 local_node_id = device->card->local_node->node_id; 916 local_node_id = device->card->node_id;
917 917
918 if (sbp2_send_management_orb(lu, node_id, generation, 918 if (sbp2_send_management_orb(lu, node_id, generation,
919 SBP2_RECONNECT_REQUEST, 919 SBP2_RECONNECT_REQUEST,