These changes are a raw update to a vanilla kernel 4.1.10, with the

[kvmfornfv.git] / kernel / lib / rhashtable.c

diff --git a/kernel/lib/rhashtable.c b/kernel/lib/rhashtable.c
index 8609378..cf910e4 100644 (file)
--- a/kernel/lib/rhashtable.c
+++ b/kernel/lib/rhashtable.c
@@ -612,6 +612,8 @@ next:
                iter->skip = 0;
        }
 
+       iter->p = NULL;
+
        /* Ensure we see any new tables. */
        smp_rmb();
 
@@ -622,8 +624,6 @@ next:
                return ERR_PTR(-EAGAIN);
        }
 
-       iter->p = NULL;
-
 out:
 
        return obj;