Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp10320389pxu; Tue, 29 Dec 2020 22:26:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzk49iE9WCVKDZ/cJTB5dQD/lD5t202Bx820EGs+4gaOP2zkrSUUIXriloFtG5tIHv571/D X-Received: by 2002:a17:907:417f:: with SMTP id oe23mr46933821ejb.259.1609309588790; Tue, 29 Dec 2020 22:26:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609309588; cv=none; d=google.com; s=arc-20160816; b=XLre55hokb+U58zfBJYldslhgrx7DrPttKkMdNtCw2nRM9bYHOZAb1ywS62QtXiRz3 hEIWGZDvSFPPi6Mvj7dYH4/oiI6bPAZiMExUBy4w4YtB6ZbncDn8ZA+n75j9FV6h6yvM 67uhxlhJQTu4RjUxwGddjM7hZf3QomK4wb7BTA82m80/JdCUcoxq1pNZqVMHBu9zK9o2 MES0PYfHSBxTR+NfBE5OvQjDBt09wMsbHHQsgUCihNg3V09eH3Tq8mkeWGNlRiNufAZx iTo4N+L2ypsUgLZd5BJuMs17V3HuDoDbokispCMtG3TnGw93fh/P75vyiGksmw0aRkTL mutg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=EqkjYJMTLN3OS0WfJW+52KGNUrYp8r5ZAQWku4CFrkA=; b=lHeyEmn3BMAg2WuXdtWBbxBVaENqk2XTk31nY6++cR1W6erWfNXEdGZfENKbNG0hug jQqeQdJ8gFjfmX3w/GIMALsAiRuesqrN1leOLqITz1opMeQX+/eaZ/7Qq439TM8LQ5Tg OwEEcn1ttHreNgJ7I+hfQC80cXq1GJhI4lXtTsGd8KhmyflE98ExDyFTDf3yx8J+9RPY oetXX+hcoVSel6azweHyih/+c/3vAHtv5LVvM02m/PAccV9xptEMII17WaP4hoiMG3SE H27zvwjF2nOsKXi0x+sVHDqGjXjVLbmuex0oi1Jz/sqqCpDX9Wn40+bypFSIAn/w5mEH VzIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id se25si21457658ejb.82.2020.12.29.22.26.05; Tue, 29 Dec 2020 22:26:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726318AbgL3GYC (ORCPT + 99 others); Wed, 30 Dec 2020 01:24:02 -0500 Received: from out4436.biz.mail.alibaba.com ([47.88.44.36]:41890 "EHLO out4436.biz.mail.alibaba.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726161AbgL3GYB (ORCPT ); Wed, 30 Dec 2020 01:24:01 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R691e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=abaci-bugfix@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0UKCfTR5_1609309377; Received: from j63c13417.sqa.eu95.tbsite.net(mailfrom:abaci-bugfix@linux.alibaba.com fp:SMTPD_---0UKCfTR5_1609309377) by smtp.aliyun-inc.com(127.0.0.1); Wed, 30 Dec 2020 14:23:07 +0800 From: YANG LI To: axboe@kernel.dk Cc: viro@zeniv.linux.org.uk, io-uring@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, YANG LI Subject: [PATCH] io_uring: style: redundant NULL check. Date: Wed, 30 Dec 2020 14:22:55 +0800 Message-Id: <1609309375-65129-1-git-send-email-abaci-bugfix@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the pointer in kfree is empty, the function does nothing, so remove the redundant NULL check. Signed-off-by: YANG LI Reported-by: Abaci --- fs/io_uring.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 7e35283..105e188 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1934,8 +1934,8 @@ static void io_dismantle_req(struct io_kiocb *req) { io_clean_op(req); - if (req->async_data) - kfree(req->async_data); + kfree(req->async_data); + if (req->file) io_put_file(req, req->file, (req->flags & REQ_F_FIXED_FILE)); if (req->fixed_file_refs) @@ -3537,8 +3537,7 @@ static int io_read(struct io_kiocb *req, bool force_nonblock, ret = 0; out_free: /* it's reportedly faster than delegating the null check to kfree() */ - if (iovec) - kfree(iovec); + kfree(iovec); return ret; } @@ -3644,8 +3643,7 @@ static int io_write(struct io_kiocb *req, bool force_nonblock, } out_free: /* it's reportedly faster than delegating the null check to kfree() */ - if (iovec) - kfree(iovec); + kfree(iovec); return ret; } @@ -6133,8 +6131,7 @@ static void __io_clean_op(struct io_kiocb *req) case IORING_OP_WRITE_FIXED: case IORING_OP_WRITE: { struct io_async_rw *io = req->async_data; - if (io->free_iovec) - kfree(io->free_iovec); + kfree(io->free_iovec); break; } case IORING_OP_RECVMSG: -- 1.8.3.1