From patchwork Thu Mar 9 12:57:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 9613305 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BCAAF602B4 for ; Thu, 9 Mar 2017 13:05:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9999223A6 for ; Thu, 9 Mar 2017 13:05:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE6062850D; Thu, 9 Mar 2017 13:05:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F036D223A6 for ; Thu, 9 Mar 2017 13:05:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932341AbdCINFg (ORCPT ); Thu, 9 Mar 2017 08:05:36 -0500 Received: from rnd-relay.smtp.broadcom.com ([192.19.229.170]:43465 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932332AbdCINFd (ORCPT ); Thu, 9 Mar 2017 08:05:33 -0500 Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.224.233]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 1133930C26D; Thu, 9 Mar 2017 04:57:41 -0800 (PST) Received: from jenkins-cam-14.cam.broadcom.com (jenkins-cam-14.cam.broadcom.com [10.177.128.77]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id D146881EA1; Thu, 9 Mar 2017 04:57:40 -0800 (PST) Received: by jenkins-cam-14.cam.broadcom.com (Postfix, from userid 25152) id E1477B84E6E; Thu, 9 Mar 2017 12:57:39 +0000 (GMT) From: Arend van Spriel To: Johannes Berg Cc: backports@vger.kernel.org, Arend van Spriel Subject: [PATCH 2/4] backports: add backport for idr_remove Date: Thu, 9 Mar 2017 12:57:31 +0000 Message-Id: <1489064253-3652-3-git-send-email-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489064253-3652-1-git-send-email-arend.vanspriel@broadcom.com> References: <1489064253-3652-1-git-send-email-arend.vanspriel@broadcom.com> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit d3e709e63e97 ("idr: Return the deleted entry from idr_remove") the function signature changed so provide a backport which does a idr_find() and subsequent idr_remove(). Signed-off-by: Arend van Spriel --- Hi Johannes, Not sure if the find/remove approach is a good one here. Better solutions are welcome. Regards, Arend --- backport/backport-include/linux/idr.h | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in diff --git a/backport/backport-include/linux/idr.h b/backport/backport-include/linux/idr.h index d7cf9f0..01aa2c2 100644 --- a/backport/backport-include/linux/idr.h +++ b/backport/backport-include/linux/idr.h @@ -61,4 +61,14 @@ static inline void idr_preload_end(void) for (id = 0; ((entry) = idr_get_next(idp, &(id))) != NULL; ++id) #endif +#if LINUX_VERSION_IS_LESS(4, 11, 0) +static inline void *backport_idr_remove(struct idr *idr, int id) +{ + void *item = idr_find(idr, id); + idr_remove(idr, id); + return item; +} +#define idr_remove backport_idr_remove +#endif + #endif /* __BACKPORT_IDR_H */