From patchwork Fri Oct 13 16:03:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 152633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1997203vqb; Fri, 13 Oct 2023 09:07:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEsKI5G3VPYN+DVnPN4w9wpwjW0tWJHUeOHLmnMLPtNsxZ1Gp14P/0hqqb+1AxCwgQ/Le/3 X-Received: by 2002:a17:902:d512:b0:1bf:349f:b85c with SMTP id b18-20020a170902d51200b001bf349fb85cmr30142049plg.1.1697213278368; Fri, 13 Oct 2023 09:07:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697213278; cv=none; d=google.com; s=arc-20160816; b=zsFpZOUafwUnAi3B8Jo3E6IstRvuoBi1QTnMGnMr72aSpQaWFBbQRf748ac/D9S940 g4Ah9gXCVsT3Lc8bkHfB0kHmPCekiXWTOGru/OVeO8L7ydlw/bIftzExP1xk8NDufoVQ /KJC7T/IH8yVNOOl+imXCiK82upH1P1sBr8nMOCPeJfPWStYkGuAaXroKmnVxuTB17sb iq2vAFBSOjVyHJUdKdF0WPwX1T4Ty3YRXS0uDr6pCVsVgRemU+iUGlkMwHmv01+QKhUR DoTMSuAT2SgZmGBFGw6llI8Q0QlCGYBKFmz7FAXiS2xvuxbIzeVshq8HUucsmo1haGca ITcg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sNTP/OfMhxIhZ+Uokb2uWeEqbTgo8AOpAI0HX1DDcAE=; fh=QCasRecNkSMoqSQLnZiX89u33dCID3L05AOtURpI2pA=; b=EDeFZUcDq/nwU1oikBUTfhG07EY4Y6yqOzL0M+aKOTbHKeK9460sa+fXpFSZhnGG30 WcxeCt7742NlRk4qfCnd6K/RZpopseYpAoc3ReNparozxZJwF0WDoHgzmWGAa6xYy89a d1i94lOxU6luKVxSxXrpECQg9iufOY65a24kzsFO8xtzxs3Rv2P6zx+aGu3fqQvdAxYW se9DkVmkgJgPbaw5BkPgmmrarAK7VPw5weRLU+d2y9YUjUTfGGhN3cDJ5R28f5uVPhWc 9i8EknZtRTCZa20o7mFWxz6E6e/M2dQXEZLLjRfyRpSRwfjViQ7y7eWKUreulTcjB407 AeuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PQVImIxQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id n13-20020a170902d2cd00b001c9ce2b6b9esi2177842plc.262.2023.10.13.09.07.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 09:07:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PQVImIxQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id A42AB8360A0D; Fri, 13 Oct 2023 09:07:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233139AbjJMQH2 (ORCPT + 19 others); Fri, 13 Oct 2023 12:07:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232763AbjJMQGa (ORCPT ); Fri, 13 Oct 2023 12:06:30 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C260116 for ; Fri, 13 Oct 2023 09:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697213136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sNTP/OfMhxIhZ+Uokb2uWeEqbTgo8AOpAI0HX1DDcAE=; b=PQVImIxQJ93sfjObCVZ7NxQrBJ7H3FmMGJTvNqvwsW62SC0rZLtb1jvkg6Wn6+fztOcfhP HVKPzb8MsRYHtllXK+uPkQLXN0krSQ3NPGlCVa5am3PEdQ6wbVV03yF+RKWOtN9WtyuEbb lWfACYugPrBFh64HVq8zqdOf5ALb5nY= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-AFJvguDWNo2pHPpzTJ-Rfg-1; Fri, 13 Oct 2023 12:05:31 -0400 X-MC-Unique: AFJvguDWNo2pHPpzTJ-Rfg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 38AD73823340; Fri, 13 Oct 2023 16:05:30 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id B23DEC15BBC; Fri, 13 Oct 2023 16:05:27 +0000 (UTC) From: David Howells To: Jeff Layton , Steve French Cc: David Howells , Matthew Wilcox , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Dominique Martinet , Ilya Dryomov , Christian Brauner , linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com Subject: [RFC PATCH 19/53] netfs: Make netfs_put_request() handle a NULL pointer Date: Fri, 13 Oct 2023 17:03:48 +0100 Message-ID: <20231013160423.2218093-20-dhowells@redhat.com> In-Reply-To: <20231013160423.2218093-1-dhowells@redhat.com> References: <20231013160423.2218093-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 13 Oct 2023 09:07:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779657110765831604 X-GMAIL-MSGID: 1779657110765831604 Make netfs_put_request() just return if given a NULL request pointer. Signed-off-by: David Howells cc: Jeff Layton cc: linux-cachefs@redhat.com cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- fs/netfs/objects.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c index 30ec42566966..7a78c1665bc9 100644 --- a/fs/netfs/objects.c +++ b/fs/netfs/objects.c @@ -111,19 +111,22 @@ static void netfs_free_request(struct work_struct *work) void netfs_put_request(struct netfs_io_request *rreq, bool was_async, enum netfs_rreq_ref_trace what) { - unsigned int debug_id = rreq->debug_id; + unsigned int debug_id; bool dead; int r; - dead = __refcount_dec_and_test(&rreq->ref, &r); - trace_netfs_rreq_ref(debug_id, r - 1, what); - if (dead) { - if (was_async) { - rreq->work.func = netfs_free_request; - if (!queue_work(system_unbound_wq, &rreq->work)) - BUG(); - } else { - netfs_free_request(&rreq->work); + if (rreq) { + debug_id = rreq->debug_id; + dead = __refcount_dec_and_test(&rreq->ref, &r); + trace_netfs_rreq_ref(debug_id, r - 1, what); + if (dead) { + if (was_async) { + rreq->work.func = netfs_free_request; + if (!queue_work(system_unbound_wq, &rreq->work)) + BUG(); + } else { + netfs_free_request(&rreq->work); + } } } }