From patchwork Tue Oct 27 13:51:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 312743 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7FECC61DD8 for ; Tue, 27 Oct 2020 15:06:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A2DD22284 for ; Tue, 27 Oct 2020 15:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811197; bh=00VfQAyHIhYkNU+oPuPIMFUTURpy2UggZAz4orAQ9dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GWGSYQeXIa0V78z6O7P2j9tTMS+rLIFAoxcv/RyyEQMxXtsusQkhOh3TyJD8QhQw+ Hv5LavIih4HBwzUQpTeHLHb+ul1dioDxstCPOJwtYxTVL7jNGR6mXKmq57bFhqJndy eEV9coImw00psOPbMpzOq5TEzULRAzBNT92uI3F4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1789828AbgJ0PDJ (ORCPT ); Tue, 27 Oct 2020 11:03:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:37504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753874AbgJ0PDH (ORCPT ); Tue, 27 Oct 2020 11:03:07 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 64E8021707; Tue, 27 Oct 2020 15:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810987; bh=00VfQAyHIhYkNU+oPuPIMFUTURpy2UggZAz4orAQ9dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I8i4WKYF38GUGh+GA24OmvwXr5+yhuQfJY7fhzl/hS9ue9qVykRBlAe/wXn8D3I0W IaazXkQPGTwdrq/INXN8YnefcWhELShqnucTZknQC2S/Y1FguNX66V+o4dH9eNZva+ IHSvH34eqjX2Cwa6XaRlpc9dPR/sMdeTcpq7AfKY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gal Pressman , Shiraz Saleem , Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.8 333/633] RDMA/umem: Fix signature of stub ib_umem_find_best_pgsz() Date: Tue, 27 Oct 2020 14:51:16 +0100 Message-Id: <20201027135538.304085260@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason Gunthorpe [ Upstream commit 61690d01db32eb1f94adc9ac2b8bb741d34e4671 ] The original function returns unsigned long and 0 on failure. Fixes: 4a35339958f1 ("RDMA/umem: Add API to find best driver supported page size in an MR") Link: https://lore.kernel.org/r/0-v1-982a13cc5c6d+501ae-fix_best_pgsz_stub_jgg@nvidia.com Reviewed-by: Gal Pressman Acked-by: Shiraz Saleem Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- include/rdma/ib_umem.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h index e3518fd6b95b1..9353910915d41 100644 --- a/include/rdma/ib_umem.h +++ b/include/rdma/ib_umem.h @@ -95,10 +95,11 @@ static inline int ib_umem_copy_from(void *dst, struct ib_umem *umem, size_t offs size_t length) { return -EINVAL; } -static inline int ib_umem_find_best_pgsz(struct ib_umem *umem, - unsigned long pgsz_bitmap, - unsigned long virt) { - return -EINVAL; +static inline unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem, + unsigned long pgsz_bitmap, + unsigned long virt) +{ + return 0; } #endif /* CONFIG_INFINIBAND_USER_MEM */