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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30893C433F5 for ; Wed, 18 May 2022 09:40:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5E5B6B0074; Wed, 18 May 2022 05:40:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0DA06B0075; Wed, 18 May 2022 05:40:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD61C6B0078; Wed, 18 May 2022 05:40:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9D3A66B0074 for ; Wed, 18 May 2022 05:40:22 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6D54A20525 for ; Wed, 18 May 2022 09:40:22 +0000 (UTC) X-FDA: 79478368284.14.F1F04B6 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf12.hostedemail.com (Postfix) with ESMTP id CC016400AE for ; Wed, 18 May 2022 09:39:52 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A52901F9CF; Wed, 18 May 2022 09:40:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1652866820; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ucsE3uapS7p1v2bugMuKZHGZtzp/VYWSq/V2Tc8LP0Q=; b=WjjzZgjv8srVBVMDw/LIsVX2F5t8kzQIJOWwqw+ZKKzgLUUdnJ0FA1FCXdWLqR9T9H7amR q1Al3cteALQzsgYD7Z3g2mpNzslcQJZa/TKEQprWwc8YuXtlhPOa4zv1ao+i5QL7PGlgR4 slgfspmMZVmDESzu/TT8YyLfvTRT838= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1652866820; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ucsE3uapS7p1v2bugMuKZHGZtzp/VYWSq/V2Tc8LP0Q=; b=NKSX849TV7BCsr2i0xjBkAnMqcR8PxpsNIq87IWcf9GC8AO2f02u3FPJrv3QMGFKLWDmKw ayzJM8aZ8x1rCSAw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 41D78133F5; Wed, 18 May 2022 09:40:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id xN7yDAO/hGLnEwAAMHmgww (envelope-from ); Wed, 18 May 2022 09:40:19 +0000 Date: Wed, 18 May 2022 11:40:16 +0200 From: Oscar Salvador To: Miaohe Lin Cc: akpm@linux-foundation.org, willy@infradead.org, vbabka@suse.cz, dhowells@redhat.com, neilb@suse.de, apopple@nvidia.com, david@redhat.com, surenb@google.com, peterx@redhat.com, naoya.horiguchi@nec.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 07/15] mm/swap: remove unneeded p != NULL check in __swap_duplicate Message-ID: References: <20220509131416.17553-1-linmiaohe@huawei.com> <20220509131416.17553-8-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220509131416.17553-8-linmiaohe@huawei.com> X-Stat-Signature: tpycfhtwspiorpfkwnjjgbbatksgbjqo X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: CC016400AE X-Rspam-User: Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=WjjzZgjv; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=NKSX849T; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf12.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.29 as permitted sender) smtp.mailfrom=osalvador@suse.de X-HE-Tag: 1652866792-586358 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: On Mon, May 09, 2022 at 09:14:08PM +0800, Miaohe Lin wrote: > If p is NULL, __swap_duplicate will already return -EINVAL. So if we > reach here, p must be non-NULL. > > Signed-off-by: Miaohe Lin Reviewed-by: Oscar Salvador > --- > mm/swapfile.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index d4b81ca887c0..7b4c99ca2aea 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -3336,8 +3336,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) > > unlock_out: > unlock_cluster_or_swap_info(p, ci); > - if (p) > - put_swap_device(p); > + put_swap_device(p); > return err; > } > > -- > 2.23.0 > > -- Oscar Salvador SUSE Labs