1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 906c5a98d814..f47b6f69d2a9 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1265,7 +1265,8 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,
                 csr1212_destroy_csr(csr);
         }
 
-        /* Mark the node current */
+        /* Finally, mark the node current */
+        smp_wmb();
         ne->generation = generation;
 
         if (ne->in_limbo) {
@@ -1798,7 +1799,7 @@ void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *packet)
 {
         packet->host = ne->host;
         packet->generation = ne->generation;
-        barrier();
+        smp_rmb();
         packet->node_id = ne->nodeid;
 }
 
@@ -1807,7 +1808,7 @@ int hpsb_node_write(struct node_entry *ne, u64 addr,
 {
         unsigned int generation = ne->generation;
 
-        barrier();
+        smp_rmb();
         return hpsb_write(ne->host, ne->nodeid, generation,
                           addr, buffer, length);
 }