From patchwork Tue Mar 28 15:09:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 76145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2314578vqo; Tue, 28 Mar 2023 08:41:54 -0700 (PDT) X-Google-Smtp-Source: AKy350aPGK6Q5UMELSQNL9AIFTFYdJhRktYXCHDWGxcJQtSjAg26pG/Uwq85SMc57lJCzezAxpvW X-Received: by 2002:a17:906:dc7:b0:92b:7e6a:bca0 with SMTP id p7-20020a1709060dc700b0092b7e6abca0mr15774390eji.14.1680018113935; Tue, 28 Mar 2023 08:41:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680018113; cv=none; d=google.com; s=arc-20160816; b=JuctzO9girejU5/tqAGD19vNwIEf7w/lg0sRlMotw9lzOJf6NcZgCULw0c4lpF3MMB e6VVsKkEwIzAX/SSWevTVsuHgIf4h/Rt/WdFnlwGFDRHa9d0CicuIOXUAzYPEnn1YbCQ c/8SyzR77x091HQ7t1QOuKyztZVfY+XkEv/j6b3/zP6Io9SYFo8iI2BMAvvcAsvLv/0/ gjIiaapGMtOBX/6MzOPvoDeFMV0qqe6RbqJBQegNgo75zRKX5oBtgEcJDb5HtgcHihBB jeoR8nLAsGRc9ddI50mIc6RX3Jw79OKQooUSLmre0aApzlTOLMlzMk4vvRkh+QdCXHJl /vbg== 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=Plah9oxK2vEYgPKSe8zMQk868IGL1eXPxQld6RUGB/s=; b=Te26Th/hEXihHzrQooKjCsgMVRtZpteKAB6xiXcmHmu659TKxwouyOd7iNcSGwbQBh nf+YrnMn+4CiqssaGZgt4Z5ZxfTnF320k9fdzlVK0wtLODxztgZww3c16OuB75fo4kJ0 yafX7gMcMBR7AF/Xghv+6v+lC/ySnDi6YsotERMeBmv/6RmqV/VOf5OfuGGmQ7bpTIyi yu/TLGZSi291HrLxUeI+pKIeF9v7fh+2zCWVR//Qqd2ZY8PDiPxsHtVR4SkWiZhiMJwV g6ksB1YUHrWpAC9Xne3C6sGPoVNsypeK+mXJCHrEz3UNvKYR38GUvx3AGdsW/otFcY3U tiZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aFe5grvN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m9-20020a17090607c900b008da063a965fsi29999901ejc.937.2023.03.28.08.41.29; Tue, 28 Mar 2023 08:41:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aFe5grvN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232156AbjC1PR7 (ORCPT + 99 others); Tue, 28 Mar 2023 11:17:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233944AbjC1PRi (ORCPT ); Tue, 28 Mar 2023 11:17:38 -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 8759310AA2 for ; Tue, 28 Mar 2023 08:16:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680016500; 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=Plah9oxK2vEYgPKSe8zMQk868IGL1eXPxQld6RUGB/s=; b=aFe5grvNnlHnopoQloN5mHTBKZryNG+4I15mAezHN8C6K/NVcRNsdjzBCR9kESQ3D3k6RT 7yiH/Ipj2tF71S51z5PpDqMDdt2GegafLv/90InrRkMCArI/B1VTuTZuXhkbjZqDqbOrTG gma6Y2NcxZn2pg1MxfTbp50eTD9umEo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-552-eIOBpHoaMdCVHdDeJnE0HA-1; Tue, 28 Mar 2023 11:11:34 -0400 X-MC-Unique: eIOBpHoaMdCVHdDeJnE0HA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4E2A3100DEBF; Tue, 28 Mar 2023 15:11:33 +0000 (UTC) Received: from localhost (ovpn-8-20.pek2.redhat.com [10.72.8.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7072214171C3; Tue, 28 Mar 2023 15:11:32 +0000 (UTC) From: Ming Lei To: Jens Axboe , io-uring@vger.kernel.org, linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Miklos Szeredi , ZiyangZhang , Xiaoguang Wang , Bernd Schubert , Pavel Begunkov , Stefan Hajnoczi , Dan Williams , Ming Lei Subject: [PATCH V5 09/16] block: ublk_drv: clean up several helpers Date: Tue, 28 Mar 2023 23:09:51 +0800 Message-Id: <20230328150958.1253547-10-ming.lei@redhat.com> In-Reply-To: <20230328150958.1253547-1-ming.lei@redhat.com> References: <20230328150958.1253547-1-ming.lei@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761626673827083186?= X-GMAIL-MSGID: =?utf-8?q?1761626673827083186?= Convert the following pattern in several helpers if (Z) return true return false into: return Z; Reviewed-by: Ziyang Zhang Signed-off-by: Ming Lei --- drivers/block/ublk_drv.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index f87597a7d679..1c057003a40a 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -298,9 +298,7 @@ static inline bool ublk_can_use_task_work(const struct ublk_queue *ubq) static inline bool ublk_need_get_data(const struct ublk_queue *ubq) { - if (ubq->flags & UBLK_F_NEED_GET_DATA) - return true; - return false; + return ubq->flags & UBLK_F_NEED_GET_DATA; } static struct ublk_device *ublk_get_device(struct ublk_device *ub) @@ -349,25 +347,19 @@ static inline int ublk_queue_cmd_buf_size(struct ublk_device *ub, int q_id) static inline bool ublk_queue_can_use_recovery_reissue( struct ublk_queue *ubq) { - if ((ubq->flags & UBLK_F_USER_RECOVERY) && - (ubq->flags & UBLK_F_USER_RECOVERY_REISSUE)) - return true; - return false; + return (ubq->flags & UBLK_F_USER_RECOVERY) && + (ubq->flags & UBLK_F_USER_RECOVERY_REISSUE); } static inline bool ublk_queue_can_use_recovery( struct ublk_queue *ubq) { - if (ubq->flags & UBLK_F_USER_RECOVERY) - return true; - return false; + return ubq->flags & UBLK_F_USER_RECOVERY; } static inline bool ublk_can_use_recovery(struct ublk_device *ub) { - if (ub->dev_info.flags & UBLK_F_USER_RECOVERY) - return true; - return false; + return ub->dev_info.flags & UBLK_F_USER_RECOVERY; } static void ublk_free_disk(struct gendisk *disk)