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=-10.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 CA297C433E0 for ; Mon, 8 Jun 2020 17:01:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 98AE32053B for ; Mon, 8 Jun 2020 17:01:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98AE32053B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F3AAB6B000E; Mon, 8 Jun 2020 13:01:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D79736B0023; Mon, 8 Jun 2020 13:01:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B777F6B000E; Mon, 8 Jun 2020 13:01:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0068.hostedemail.com [216.40.44.68]) by kanga.kvack.org (Postfix) with ESMTP id 8C6066B0010 for ; Mon, 8 Jun 2020 13:01:40 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 220F91C829C for ; Mon, 8 Jun 2020 17:01:40 +0000 (UTC) X-FDA: 76906661160.02.grape95_550a40126dbb Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 11D6F940B3 for ; Mon, 8 Jun 2020 17:01:36 +0000 (UTC) X-HE-Tag: grape95_550a40126dbb X-Filterd-Recvd-Size: 3407 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Mon, 8 Jun 2020 17:01:35 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id x22so8805389pfn.3 for ; Mon, 08 Jun 2020 10:01:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jH2CPsvsaNzRGDf+QoUv0Reklj4c8N9GM5jBSfoalww=; b=iwKeW5JHpikXBm/C6qJ1E01v24OgF0c26iaPiyQyr5g9Cz+QK8Xmm9ydOSFDgTD4ca kSFFDaPjv+WKB1DbPwo+sNK9Nas+M/VScFL/YyDcrzYp274ajBcATcrnQNdf2neENypE 32x/L2gkPNxD+77mNg3XHLoGSHmm1PSdoiaPRId3f7kcOgZo8fp6chhflV9cnlYBQ7A0 9ikHpN8Q61rcnVXA69chhNR1sVTgELsYJtwrIVVvrmNoa8ZDKhiCcwquAZCYN23Tx/rk qrwyzS+ejMN8iuMC62VJiszsXt9RBIccdUeEFt8oXGjE0yc17/yqhuKgTy9smzQYWWGm qIGg== X-Gm-Message-State: AOAM5318Mee0tpyx0HxVR3bDR8sITP7QxpeQHlb8zh4WgurD0DYPyDL5 KknShJfLnQWIfAebjL7Z5yA= X-Google-Smtp-Source: ABdhPJwwBujS3U9PCsomBnrxJDGD76z2zyRa1W/F///y1VSt1LrxETfDgpsHrdXoXXBTG59fZ8Mfyg== X-Received: by 2002:a63:6345:: with SMTP id x66mr20466636pgb.156.1591635694775; Mon, 08 Jun 2020 10:01:34 -0700 (PDT) Received: from 42.do-not-panic.com (42.do-not-panic.com. [157.230.128.187]) by smtp.gmail.com with ESMTPSA id x197sm7671771pfc.13.2020.06.08.10.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 10:01:32 -0700 (PDT) Received: by 42.do-not-panic.com (Postfix, from userid 1000) id 6DF0E41D95; Mon, 8 Jun 2020 17:01:28 +0000 (UTC) From: Luis Chamberlain To: axboe@kernel.dk, viro@zeniv.linux.org.uk, bvanassche@acm.org, gregkh@linuxfoundation.org, rostedt@goodmis.org, mingo@redhat.com, jack@suse.cz, ming.lei@redhat.com, nstange@suse.de, akpm@linux-foundation.org Cc: mhocko@suse.com, yukuai3@huawei.com, martin.petersen@oracle.com, jejb@linux.ibm.com, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v6 4/6] blktrace: annotate required lock on do_blk_trace_setup() Date: Mon, 8 Jun 2020 17:01:24 +0000 Message-Id: <20200608170127.20419-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20200608170127.20419-1-mcgrof@kernel.org> References: <20200608170127.20419-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 11D6F940B3 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Ensure it is clear which lock is required on do_blk_trace_setup(). Suggested-by: Bart Van Assche Signed-off-by: Luis Chamberlain --- kernel/trace/blktrace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 7f60029bdaff..7ff2ea5cd05e 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -483,6 +483,8 @@ static int do_blk_trace_setup(struct request_queue *q= , char *name, dev_t dev, struct dentry *dir =3D NULL; int ret; =20 + lockdep_assert_held(&q->blk_trace_mutex); + if (!buts->buf_size || !buts->buf_nr) return -EINVAL; =20 --=20 2.26.2