Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp3622343pxp; Tue, 15 Mar 2022 02:47:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5RjGyc0INeav5cWNHjy4GIszfpBt81yRIJKyC+DgtrAdFOwetLsLRUarvHe70t4rbProm X-Received: by 2002:a17:902:f545:b0:151:fa59:95bc with SMTP id h5-20020a170902f54500b00151fa5995bcmr27965788plf.82.1647337671303; Tue, 15 Mar 2022 02:47:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647337671; cv=none; d=google.com; s=arc-20160816; b=I4PB6rSFDVlEof58mBAYQH7EvbnysuiJQt9yqrYvNZE6YO/du6w9zI4s+caun/YBX6 TXAzGnoUaP0teYyHl+eMj8qOhlsz8pkLgh3ve0qqh8h/4Nk1Qkez9sZH4OfsX1D6X2aI OFM0nUO1U32RkHczLsbhfGvms60KXI77/j0lNfAitHB5hU17Sb0D0ohidWnGRKzm9thu db97ApUpzgfVntCP4I9mEztmS3dYuCy6haH9aA3bY2+c1/EJLmo/W945cKiPkfEPMfkn iE1AfpSGD60ojLktu+950TardgqIgd0ixoxaf7XWNE9rXJATp3dSlVk5gaM3S7j6/xRS reKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C9mleIsVSmq6DZHAEnKTMKU1dm/m+QKjVN5t4gtYKEk=; b=c0QAGjRSbkbFU7VL9nSgOzRGwTPrJbjZSwOsTgZxs2qOksME9fRh2TBFil5KEn19R7 nVz9Dja40j0rZtI+nl1KkEeWnTztLtvAqw2/V7rRgld/MAV3amESgERbD5xbEoK+8LLW zCpg21CYMku2/sSu04mX2+pZAXWKkA+oFpVS1FZGOuDTm0OOA1hoR99+m+FrrO5Lmu3J C3S9srsywSX9H0zE24Z3ijD5RBwE3zaeinl7IdYieSa3Qe7j1TN4uLF3P25sJSqWYjWv OZshSuLH+IyDa6PZL1m6VaExa+d+F1AyLgCoLEDlrYhARnYwQlAx19eoghI91hM1+neI He8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AzKzYBFk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c20-20020a6566d4000000b0037ffcb8a426si18925557pgw.594.2022.03.15.02.47.38; Tue, 15 Mar 2022 02:47:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AzKzYBFk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241210AbiCNMVy (ORCPT + 99 others); Mon, 14 Mar 2022 08:21:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240764AbiCNMMK (ORCPT ); Mon, 14 Mar 2022 08:12:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB2F9340F0; Mon, 14 Mar 2022 05:10:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 45BF6612FC; Mon, 14 Mar 2022 12:10:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA1E8C340EC; Mon, 14 Mar 2022 12:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647259834; bh=biVQO26JNhnpkhW6bbPtwyeL1122P5bPQiLIBuM1CHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AzKzYBFkQvTed50m2fGrpG7cuFSy2JPhim05v2o01Rc2mpU/SiUD7W4IN1NQyxenU t8tn0XAX3Z4ULl1nfvhYJE5tmB85zCoEIMrBJoSiKrvqb1W5NDXDfgm/DWdCtAquhT pLqb8/5e2DmfDHAj6zcfT/w+TzK01C7xmcUiIA8o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jann Horn , David Howells , Linus Torvalds Subject: [PATCH 5.15 100/110] watch_queue: Make comment about setting ->defunct more accurate Date: Mon, 14 Mar 2022 12:54:42 +0100 Message-Id: <20220314112745.817140858@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220314112743.029192918@linuxfoundation.org> References: <20220314112743.029192918@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Howells commit 4edc0760412b0c4ecefc7e02cb855b310b122825 upstream. watch_queue_clear() has a comment stating that setting ->defunct to true preventing new additions as well as preventing notifications. Whilst the latter is true, the first bit is superfluous since at the time this function is called, the pipe cannot be accessed to add new event sources. Remove the "new additions" bit from the comment. Fixes: c73be61cede5 ("pipe: Add general notification queue support") Reported-by: Jann Horn Signed-off-by: David Howells Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- kernel/watch_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/watch_queue.c +++ b/kernel/watch_queue.c @@ -569,7 +569,7 @@ void watch_queue_clear(struct watch_queu rcu_read_lock(); spin_lock_bh(&wqueue->lock); - /* Prevent new additions and prevent notifications from happening */ + /* Prevent new notifications from being stored. */ wqueue->defunct = true; while (!hlist_empty(&wqueue->watches)) {