From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751222AbdCQXgW (ORCPT ); Fri, 17 Mar 2017 19:36:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38114 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751061AbdCQXgV (ORCPT ); Fri, 17 Mar 2017 19:36:21 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3957480481 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=agruenba@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 3957480481 From: Andreas Gruenbacher To: linux-kernel@vger.kernel.org Cc: Andreas Gruenbacher , Herbert Xu , Thomas Graf , "David S. Miller" , rpeterso@redhat.com, cluster-devel@redhat.com, netdev@vger.kernel.org Subject: [PATCH] rhashtable: Add rhashtable_lookup_get_insert_fast Date: Sat, 18 Mar 2017 00:36:15 +0100 Message-Id: <1489793775-25152-1-git-send-email-agruenba@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 17 Mar 2017 23:36:21 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add rhashtable_lookup_get_insert_fast for fixed keys, similar to rhashtable_lookup_get_insert_key for explicit keys. Signed-off-by: Andreas Gruenbacher Acked-by: Herbert Xu --- include/linux/rhashtable.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h index 092292b..e507290 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h @@ -916,6 +916,28 @@ static inline int rhashtable_lookup_insert_fast( } /** + * rhashtable_lookup_get_insert_fast - lookup and insert object into hash table + * @ht: hash table + * @obj: pointer to hash head inside object + * @params: hash table parameters + * + * Just like rhashtable_lookup_insert_fast(), but this function returns the + * object if it exists, NULL if it did not and the insertion was successful, + * and an ERR_PTR otherwise. + */ +static inline void *rhashtable_lookup_get_insert_fast( + struct rhashtable *ht, struct rhash_head *obj, + const struct rhashtable_params params) +{ + const char *key = rht_obj(ht, obj); + + BUG_ON(ht->p.obj_hashfn); + + return __rhashtable_insert_fast(ht, key + ht->p.key_offset, obj, params, + false); +} + +/** * rhashtable_lookup_insert_key - search and insert object to hash table * with explicit key * @ht: hash table -- 2.7.4