From patchwork Sat Nov 11 04:30:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Sakai X-Patchwork-Id: 13452972 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EE566FCB for ; Sat, 11 Nov 2023 04:30:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EgyhascA" 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 2D246448C for ; Fri, 10 Nov 2023 20:30:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699677048; 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=Q4yhU04vpjnU33lo8oVlkUBraK4J7ZGWLAvJ1ibrpDk=; b=EgyhascAb+SGN8G+hZrgWVHBJcbTu4NnfJbSBw2LPl2clcOXdoVvCQ6H1fmA05/+ExjZs0 WuytwFehqvZKN0NpQ9v/xuesnoAQ6bbdfJo2dFe7tPbFOyN/vNSvEQOc6ChYNu0kOVqtcN VYAoF9N1GlFASq5/FlxVhvSL2ohnOtI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-KDrI2sqxN36ji8yaw7aPfg-1; Fri, 10 Nov 2023 23:30:46 -0500 X-MC-Unique: KDrI2sqxN36ji8yaw7aPfg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 88BE9101A53B; Sat, 11 Nov 2023 04:30:46 +0000 (UTC) Received: from pbitcolo-build-10.permabit.com (pbitcolo-build-10.permabit.lab.eng.bos.redhat.com [10.19.117.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E79C492BE7; Sat, 11 Nov 2023 04:30:46 +0000 (UTC) Received: by pbitcolo-build-10.permabit.com (Postfix, from userid 1138) id 3509B3003D; Fri, 10 Nov 2023 23:30:46 -0500 (EST) From: Matthew Sakai To: dm-devel@lists.linux.dev, linux-block@vger.kernel.org Cc: Mike Snitzer , Matthew Sakai Subject: [PATCH 8/8] dm vdo memory-alloc: mark branch unlikely() in uds_allocate_memory() Date: Fri, 10 Nov 2023 23:30:44 -0500 Message-Id: <1627ae51fd2896d5d24748456f1a2e10ad299e8f.1699675570.git.msakai@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 From: Mike Snitzer Remove temporary 'duration' variable. And cleanup coding style nit. Reviewed-by: Susan LeGendre-McGhee Signed-off-by: Mike Snitzer Signed-off-by: Matthew Sakai --- drivers/md/dm-vdo/memory-alloc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-vdo/memory-alloc.c b/drivers/md/dm-vdo/memory-alloc.c index 136a19db33be..e9464d4a1e64 100644 --- a/drivers/md/dm-vdo/memory-alloc.c +++ b/drivers/md/dm-vdo/memory-alloc.c @@ -286,13 +286,9 @@ int uds_allocate_memory(size_t size, size_t align, const char *what, void *ptr) if (allocations_restricted) memalloc_noio_restore(noio_flags); - if (p == NULL) { - unsigned int duration = jiffies_to_msecs(jiffies - start_time); - + if (unlikely(p == NULL)) { uds_log_error("Could not allocate %zu bytes for %s in %u msecs", - size, - what, - duration); + size, what, jiffies_to_msecs(jiffies - start_time)); return -ENOMEM; }