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: 13421160 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 906F0CDB483 for ; Fri, 13 Oct 2023 16:05:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC8DA6B0299; Fri, 13 Oct 2023 12:05:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D7A496B029A; Fri, 13 Oct 2023 12:05:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C19136B029B; Fri, 13 Oct 2023 12:05:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B07AF6B0299 for ; Fri, 13 Oct 2023 12:05:39 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6C78B160394 for ; Fri, 13 Oct 2023 16:05:39 +0000 (UTC) X-FDA: 81340913598.01.0690FF6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 782D310000F for ; Fri, 13 Oct 2023 16:05:37 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PQVImIxQ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697213137; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=sNTP/OfMhxIhZ+Uokb2uWeEqbTgo8AOpAI0HX1DDcAE=; b=1TXWMX+5xIgcC83+qjf/AUkqn9TjMGSQKjIvmPF5kNU/CN/sZIkHYLDWxvsmXk5+4dSSdO ZWjKRjrTjDEEpXw2T2gKxYXEGFK2bNpyg/ciqmN4pwiOK6ftTUbl3xo8PiVOB/hKYW0DkT Z7y4XTT49k6KVqeCA1+ZWbQQaLEgCE0= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PQVImIxQ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697213137; a=rsa-sha256; cv=none; b=pcWc+G+/Y1YkP9wcsZt+J7V6aPc5wMiuGerWwyzciFt9jmAWy2bDIFWjF0NGLzzkFNkR5J Syu3qtuYMGgzIvoHxNYzXno8Vtfr/SIFSO2e7icsUgByi0xBo/t7onyJoeCMdYg8AnsOkA TW3iPC4Q3Bi1WUsW9p1sc3SSQaVkWsw= 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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 782D310000F X-Stat-Signature: ekhxinn3fzrphjrzxcyz9xxmxk3kqmex X-HE-Tag: 1697213137-448173 X-HE-Meta: U2FsdGVkX183bYEA0vaZgo/e4flMHUerEVz6T9ZqX+Q8tmw69HA0P4m1CIgbMGnJ05mcwrmedwx8QX4mnKzfYWNJTSXzZiN77w9QekqrZLTDyHnIEg98qyY9iyeh2Feh5gWBWKmzclP68st7Ik3K7Kgyk0Z5wFEQ5dKmUF3lWHB+7J8NcKl13rVv4Hp8zCgKJ6wDlnBgb5VCi3jemqDwz2cKUmj6Vp6JlQjqcerkfDCl8H9oMSLRPkVgOrWLclA3tism0FK3q2LCRqtJh+9iuFriuGJc6/+LTvbkjdFnAXjruTk32R1r5dqQnaF83hf7MeZf4p7gkY7cnDWOsVkUJsd5RmOGaiNNbNneqmEs1b/9LA2VtJhAgFNymRz4CiGM21URDfDyed9rV99j5Ulve/pVB4edDoo3t8n/9smYOtpr/rO20IOQFUobQujCi/qm6zNOA7FXt1lxKiJ9A4zesVdtD/KeCKnuhANoWcEjz+F4QazNiFke9aA+QcfFdStdE51YZxJUuK2UjLGREVHg6bcatCtKNeNuK4iLSa7lRtIDmRMotdMF1wiapfntQiOWDbIYK11xptB5qgWR1mchgyqnFYr591tdJkZKYMdkzb/LWFDkWx3yPyWaUHmjTtGzeHNg4Bi6ZukcFU/9yGeIV3UAyjizUXaKFTM7snM0ntowX0Z+ytoFZhClUN9Xz1dDlxmVxntD8YAyZUjYqVt0DsYUbaDGI9Hn0AajJvS77OCw9ABJfV9x0QTVc6CUnajMdLeFIt5xXiAK1DcyQlLLkFiLM/b8W6lJRyFeWPTfBaOAnyPmB+vMhw04TvGhvXdOu2bS7/c/iAoje7vBjZi4N0ok306AjEayo4Fqtipog8q/8aCXgMYYDKEdFWQlVGaQVudWQGZpOlcUgGwhYBCN2ZEv4f+uQoMBHtWZBDtOCH2Wk2Nhkd9uTFW0JCJ6vZghdDeM+Je0z4hNJ/LH6lk CKN2w/k/ whOAHNnjHbOLfqbcsX88OYu4jlmS61SWgi5UyQyluuXrKl3/xb9x5glS9hlYQxc/2bkgq/CaJRf6dNplSr+tmkKo7B2zXYRD20Sk8l9/e84vplmEHBCDA6hEadJRBoW53tPJCXg5ZYPICD1LaUsN7KzvQRY1EvuSZdrKg8ZPm1tm/z7MpVNVF1mbR7/yV4Q7mmeZcdXnqzQOtu7Ts04lMPMbOa1/kVKDmXr8s9dOa3IfhtUcXhZ3q5IcI9yxg3crZmNjtWlgEE/x6latB8J3eEeFlgbap+rT9HiEGn4Xsy80wmw9ezrpl0eaWKDKnzn45PA/vceSQDCX60icgpPtEYU/EVw== 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: 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); + } } } }