From 0f19b7badcb3184bf99bd0686c4f0844afae9d1f Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 12 Feb 2008 22:15:14 -0800 Subject: [PATCH] --- yaml --- r: 85647 b: refs/heads/master c: 4c3a0a254e5d706d3fe01bf42261534858d05586 h: refs/heads/master i: 85645: f290cf60f9dae7f50c6b3343e5486675ea9061dd 85643: e9aaee200c8aa5a1e0ab79a94048ce04ee647bc3 85639: aa50f79f2f38806c44cda25d03c82f721ba35e20 85631: 603f8bf320ee9ef4292cc79682e58fb4d3483511 v: v3 --- [refs] | 2 +- trunk/net/netlabel/netlabel_domainhash.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 53f35dd5fe09..15182645a31c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f8f27c39553dd3aedcaf5c39adefe3efef28b6b +refs/heads/master: 4c3a0a254e5d706d3fe01bf42261534858d05586 diff --git a/trunk/net/netlabel/netlabel_domainhash.c b/trunk/net/netlabel/netlabel_domainhash.c index 9a8ea0195c4f..fd462313471c 100644 --- a/trunk/net/netlabel/netlabel_domainhash.c +++ b/trunk/net/netlabel/netlabel_domainhash.c @@ -150,11 +150,11 @@ static struct netlbl_dom_map *netlbl_domhsh_search_def(const char *domain) entry = netlbl_domhsh_search(domain); if (entry == NULL) { entry = rcu_dereference(netlbl_domhsh_def); - if (entry != NULL && entry->valid) - return entry; + if (entry != NULL && !entry->valid) + entry = NULL; } - return NULL; + return entry; } /*