From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 28C47C2BB1D for ; Wed, 15 Apr 2020 00:45:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0015220737 for ; Wed, 15 Apr 2020 00:45:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="h6MEDxzu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2634632AbgDOApA (ORCPT ); Tue, 14 Apr 2020 20:45:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2634576AbgDOAoE (ORCPT ); Tue, 14 Apr 2020 20:44:04 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3D51C061A0C for ; Tue, 14 Apr 2020 17:44:03 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id i128so1429826pfc.4 for ; Tue, 14 Apr 2020 17:44:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=PFykNGvDt3Bxt0QgQrjfg5BlhCJRU6MbqMOEnjuLcXU=; b=h6MEDxzulGPn8cUv0luU8RVJe/qfhKlzGqRAQXJbs0Af3EIO+a8KI9Z0bZUIBiyoWC T1/f4ACXdlJ49iQHdhLlGbErN/dif21WNj2Azxnd2qdIjbAo/BFdIc8Su7g50sEjWn8e tli6Zqof+vrBGHCO+l2gLzPrZhPOHOuYBWTrYEdSVcQC+Utd0xoupvOQaQ1Dwk85/buS aol7oU58RmTZy+Nqktgd2WZuGy42av2XvOqGGPgKYDoTnzF4VxxU8ake9J/tbjefur9I SMGuflZz+iB5zk5uZgdDrgOgyC9cvRqCW9E597ljNQgoKQ9ndAJ+YP5y9xqJ/sYFFe+l L6tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=PFykNGvDt3Bxt0QgQrjfg5BlhCJRU6MbqMOEnjuLcXU=; b=AUBkPK5IEWEaCitJ9lE3d+VX19Mqb5UDbwWPdbvBSG08qeGB6Ft6njYnkZSoeonBWP qx3OvNgrETOa4jo2PxwWcHU9h9bs8qyiEuuqKBhtgY73ZOOsP/IvqOZ/Dy+YJpPaXQZC 4e54kHAeq/VtAqpDPt0BtBBgr5uIF6i3X4Np4jqCSLwviB2MPmSu0EcOMNPT8LwZb3MC /wo0zjYJXt/p5AlJdk+eal1M8uwSEuUAyUFGj6OShiO1HjgmWxsG+m2V5qFKHKWZUdgE QqDht8VMCOrSTlL2VKe5el+pkBl13X99+B0A87kBFJ2ExjGMaILoExHwJutmdthR1BeW /H+w== X-Gm-Message-State: AGi0PubVsTkTrv8m1HAOUbJtL4fDySzBFBrbjehdcqhS/KNO2qEMgqKk 0N7Mdp28hPe/91I7bQvfKobVO5o2lHw= X-Google-Smtp-Source: APiQypJUPOjXj47njM/tZMnKODRO80SSygsOwTD52IPYAElI2mroURYKiHWeE4U+jjih6llcE6QYZ2x7niU= X-Received: by 2002:a63:40f:: with SMTP id 15mr16254934pge.57.1586911443279; Tue, 14 Apr 2020 17:44:03 -0700 (PDT) Date: Tue, 14 Apr 2020 17:43:46 -0700 In-Reply-To: <20200415004353.130248-1-walken@google.com> Message-Id: <20200415004353.130248-4-walken@google.com> Mime-Version: 1.0 References: <20200415004353.130248-1-walken@google.com> X-Mailer: git-send-email 2.26.0.110.g2183baf09c-goog Subject: [PATCH v4 03/10] DMA reservations: use the new mmap locking API From: Michel Lespinasse To: Andrew Morton , linux-mm Cc: LKML , Peter Zijlstra , Laurent Dufour , Vlastimil Babka , Matthew Wilcox , Liam Howlett , Jerome Glisse , Davidlohr Bueso , David Rientjes , Hugh Dickins , Ying Han , Jason Gunthorpe , Daniel Jordan , Michel Lespinasse Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This use is converted manually ahead of the next patch in the series, as it requires including a new header which the automated conversion would miss. Signed-off-by: Michel Lespinasse Reviewed-by: Daniel Jordan --- drivers/dma-buf/dma-resv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index 4264e64788c4..b45f8514dc82 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -34,6 +34,7 @@ #include #include +#include #include /** @@ -109,7 +110,7 @@ static int __init dma_resv_lockdep(void) dma_resv_init(&obj); - down_read(&mm->mmap_sem); + mmap_read_lock(mm); ww_acquire_init(&ctx, &reservation_ww_class); ret = dma_resv_lock(&obj, &ctx); if (ret == -EDEADLK) @@ -118,7 +119,7 @@ static int __init dma_resv_lockdep(void) fs_reclaim_release(GFP_KERNEL); ww_mutex_unlock(&obj.lock); ww_acquire_fini(&ctx); - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); mmput(mm); -- 2.26.0.110.g2183baf09c-goog