From nobody Fri Jun 19 07:18:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC80DC433F5 for ; Wed, 6 Apr 2022 20:50:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231942AbiDFUwV (ORCPT ); Wed, 6 Apr 2022 16:52:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233231AbiDFUvf (ORCPT ); Wed, 6 Apr 2022 16:51:35 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D149F21C059 for ; Wed, 6 Apr 2022 12:07:32 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a6so6360844ejk.0 for ; Wed, 06 Apr 2022 12:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OeMtijpkibGaog7F58AuM7SBlMK2GtUfrLCNQpMtHag=; b=x+LhGUsW+0qT4WfR+xdfEVx4Wb4G/SZfdzhW8JpwU9lryyw+1poelkt7BcXTx9n2M1 FkPy9BlGuV5o30zZ1i4WKuN1GtFcdJ41HO8iPDQum6ma/u+qqkle49MrIQDSOXP/Bi3Q G7It2UxXLxl1Xel03xFsrb61xso0PqJGuYVDSj5R2JA94iUUQ/wfdQF1qBDkmEWwGa5C 2qWuxWeHtOSBVaSTZI++qvXlur6gUIDBhEMDnGRenUS/5M8kZ9HnIf1hpEbW4bflMcKM +ZhTbpXBtEsUnOKKpwzgzw/gSwJH9mRcoXVRnXmRmsld4l93NDOdEjDicU54wv9AOcM4 ZJSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OeMtijpkibGaog7F58AuM7SBlMK2GtUfrLCNQpMtHag=; b=sIx8Bt3Dv2cRUfLvDNtpKmzfjXB7r42YJgtFbZquhAuB8IakXPS5+csFzt5DwqF+p0 3vEdzqr3yjhUU0Vw3y0THBajCjYjY6bjry/N40VygXgIIjuLm+Iusr4g63rhXwpkjnZw g0+zFW9AeEfH4AXqUptL5oAdUvFKPe8suuyAK2fvVr4+i4wJOAVFjdtHcd4zAroVo9nA g7TE+9sItc9ZJ/csgdFHNq0NRJQkle7FLfUyN0A1TJe4nLdBeFTQXvEzdkTn4iu5ZHMw RcsZXZ+shmI9t1rX43LYNt4Cexp2uFQ6Q2kZ/EDcWR38wNLwpoZC8l1MO5aQVMuMx4F8 CINg== X-Gm-Message-State: AOAM533ymCIGDk2FCa8aWIa+N+JVJ+5BciTNlAACPZGsUqPJtkRvJxpC pP0wT0onkB3CVFdAcYN52eC2VA== X-Google-Smtp-Source: ABdhPJyeoQlMZGBzfnq9pnEc5goeLQqQ6V5UkPlAs8RjqvSnU53g3p7zUbSHqMEGb8+2kQh2EtAllw== X-Received: by 2002:a17:907:1ca4:b0:6da:86a4:1ec7 with SMTP id nb36-20020a1709071ca400b006da86a41ec7mr9942094ejc.556.1649272051333; Wed, 06 Apr 2022 12:07:31 -0700 (PDT) Received: from localhost (85-127-190-169.dsl.dynamic.surfer.at. [85.127.190.169]) by smtp.gmail.com with ESMTPSA id o3-20020aa7c7c3000000b00410d407da2esm7960722eds.13.2022.04.06.12.07.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:07:30 -0700 (PDT) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, Arnd Bergmann , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= Subject: [PATCH 1/7] drbd: fix duplicate array initializer Date: Wed, 6 Apr 2022 21:07:09 +0200 Message-Id: <20220406190715.1938174-2-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> References: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann There are two initializers for P_RETRY_WRITE: drivers/block/drbd/drbd_main.c:3676:22: warning: initialized field overwrit= ten [-Woverride-init] Remove the first one since it was already ignored by the compiler and reorder the list to match the enum definition. As P_ZEROES had no entry, add that one instead. Fixes: 036b17eaab93 ("drbd: Receiving part for the PROTOCOL_UPDATE packet") Fixes: f31e583aa2c2 ("drbd: introduce P_ZEROES (REQ_OP_WRITE_ZEROES on the = "wire")") Signed-off-by: Arnd Bergmann Reviewed-by: Christoph B=C3=B6hmwalder --- drivers/block/drbd/drbd_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 9676a1d214bc..90a0814343df 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -3587,9 +3587,8 @@ const char *cmdname(enum drbd_packet cmd) * when we want to support more than * one PRO_VERSION */ static const char *cmdnames[] =3D { + [P_DATA] =3D "Data", - [P_WSAME] =3D "WriteSame", - [P_TRIM] =3D "Trim", [P_DATA_REPLY] =3D "DataReply", [P_RS_DATA_REPLY] =3D "RSDataReply", [P_BARRIER] =3D "Barrier", @@ -3600,7 +3599,6 @@ const char *cmdname(enum drbd_packet cmd) [P_DATA_REQUEST] =3D "DataRequest", [P_RS_DATA_REQUEST] =3D "RSDataRequest", [P_SYNC_PARAM] =3D "SyncParam", - [P_SYNC_PARAM89] =3D "SyncParam89", [P_PROTOCOL] =3D "ReportProtocol", [P_UUIDS] =3D "ReportUUIDs", [P_SIZES] =3D "ReportSizes", @@ -3608,6 +3606,7 @@ const char *cmdname(enum drbd_packet cmd) [P_SYNC_UUID] =3D "ReportSyncUUID", [P_AUTH_CHALLENGE] =3D "AuthChallenge", [P_AUTH_RESPONSE] =3D "AuthResponse", + [P_STATE_CHG_REQ] =3D "StateChgRequest", [P_PING] =3D "Ping", [P_PING_ACK] =3D "PingAck", [P_RECV_ACK] =3D "RecvAck", @@ -3618,23 +3617,25 @@ const char *cmdname(enum drbd_packet cmd) [P_NEG_DREPLY] =3D "NegDReply", [P_NEG_RS_DREPLY] =3D "NegRSDReply", [P_BARRIER_ACK] =3D "BarrierAck", - [P_STATE_CHG_REQ] =3D "StateChgRequest", [P_STATE_CHG_REPLY] =3D "StateChgReply", [P_OV_REQUEST] =3D "OVRequest", [P_OV_REPLY] =3D "OVReply", [P_OV_RESULT] =3D "OVResult", [P_CSUM_RS_REQUEST] =3D "CsumRSRequest", [P_RS_IS_IN_SYNC] =3D "CsumRSIsInSync", + [P_SYNC_PARAM89] =3D "SyncParam89", [P_COMPRESSED_BITMAP] =3D "CBitmap", [P_DELAY_PROBE] =3D "DelayProbe", [P_OUT_OF_SYNC] =3D "OutOfSync", - [P_RETRY_WRITE] =3D "RetryWrite", [P_RS_CANCEL] =3D "RSCancel", [P_CONN_ST_CHG_REQ] =3D "conn_st_chg_req", [P_CONN_ST_CHG_REPLY] =3D "conn_st_chg_reply", [P_PROTOCOL_UPDATE] =3D "protocol_update", + [P_TRIM] =3D "Trim", [P_RS_THIN_REQ] =3D "rs_thin_req", [P_RS_DEALLOCATED] =3D "rs_deallocated", + [P_WSAME] =3D "WriteSame", + [P_ZEROES] =3D "Zeroes", =20 /* enum drbd_packet, but not commands - obsoleted flags: * P_MAY_IGNORE --=20 2.35.1 From nobody Fri Jun 19 07:18:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE5BCC433EF for ; Wed, 6 Apr 2022 20:51:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232750AbiDFUwa (ORCPT ); Wed, 6 Apr 2022 16:52:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233209AbiDFUvf (ORCPT ); Wed, 6 Apr 2022 16:51:35 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14D852D8644 for ; Wed, 6 Apr 2022 12:07:34 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id bq8so6207171ejb.10 for ; Wed, 06 Apr 2022 12:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c/zihez/h+mzXfDfKYfT6QVLBkQq8Rn6YB77YCPC8z0=; b=vB0aQHaGkI3teNHscNCb9ZmZXWEHRU+XumY9K6E9fOqNCVDebbIZFBygMSg425zqKV vdNgtKhGaiH/WSzEKdWbJU/69wMElpiqe3z3skLzQ8GWjHSVxjVBt9CzxklRuW1tNyPi iRmKFWpsIerNIOwQ53m9IM6+rwjRNTHDGwLkRPbhYjDYl71MARSx7UhaeWILT0KB0IJX Pq/jFCj+Gruco/niVvr75/9vgPTxFteWDGVDi3JbHIrGDi0ow/EoDv7u+TSbglue828y GzrN9R/pvt1SHeEg0LbcRSSPptGZnYMtxXCe3rqVlFaXKkESgYidWE+ctAbXVlxInWZU nDTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c/zihez/h+mzXfDfKYfT6QVLBkQq8Rn6YB77YCPC8z0=; b=ii+GqzOBQrdf/NTSyShnQ5u4KbSo8McOERholkLag38sMtyr9STvWTHk1a9rlqmVSE Gp39oMc0QWNEDoAGfdrXXbtOdsf3GO6TItrUmGC7NIipFXcQtm1ElIL23dTHVaZhSqam 5v8VM1noQvmPH+HDd01S8gdCoH/yEndeyYyJqgLBxJcfj05EZ2XuqdzXhj9KwRrstuII bKCDQ3Sw/enfeMYFoT0zz46TIdDVvq5xuolKFBfPHHZcAo6Eg4G25zKBrn5oLVKRNjqf kMYyFicROJEXJzfFdtlx2NQ9mXoMb4v6KOO2OjWSL0zl3aviAiGI9lq+RpHQGK9J2dSd l5aA== X-Gm-Message-State: AOAM532Zop8lPQmiGNrr41JdmCkGlidO8jb0IqESBeC99RdjzhFY04YA oPJYlDkXan0XX4Ktn8iwyrJHYA== X-Google-Smtp-Source: ABdhPJxWI/reqSRbs4HBj3AoEgi/XmuoEqdfIbNcLAijgQMdbFysWX+mVK3VuK2IqRmMkXOekoatlg== X-Received: by 2002:a17:907:7f04:b0:6e0:39a2:79a6 with SMTP id qf4-20020a1709077f0400b006e039a279a6mr9472703ejc.243.1649272052611; Wed, 06 Apr 2022 12:07:32 -0700 (PDT) Received: from localhost (85-127-190-169.dsl.dynamic.surfer.at. [85.127.190.169]) by smtp.gmail.com with ESMTPSA id gv55-20020a1709072bf700b006e82ef9b910sm110685ejc.70.2022.04.06.12.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:07:32 -0700 (PDT) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, Arnd Bergmann , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= Subject: [PATCH 2/7] drbd: address enum mismatch warnings Date: Wed, 6 Apr 2022 21:07:10 +0200 Message-Id: <20220406190715.1938174-3-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> References: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann gcc -Wextra warns about mixing drbd_state_rv with drbd_ret_code in a couple of places: drivers/block/drbd/drbd_nl.c: In function 'drbd_adm_set_role': drivers/block/drbd/drbd_nl.c:777:14: warning: comparison between 'enum drbd= _state_rv' and 'enum drbd_ret_code' [-Wenum-compare] 777 | if (retcode !=3D NO_ERROR) | ^~ drivers/block/drbd/drbd_nl.c:784:12: warning: implicit conversion from 'enu= m drbd_ret_code' to 'enum drbd_state_rv' [-Wenum-conversion] 784 | retcode =3D ERR_MANDATORY_TAG; | ^ drivers/block/drbd/drbd_nl.c: In function 'drbd_adm_attach': drivers/block/drbd/drbd_nl.c:1965:10: warning: implicit conversion from 'en= um drbd_state_rv' to 'enum drbd_ret_code' [-Wenum-conversion] 1965 | retcode =3D rv; /* FIXME: Type mismatch. */ | ^ drivers/block/drbd/drbd_nl.c: In function 'drbd_adm_connect': drivers/block/drbd/drbd_nl.c:2690:10: warning: implicit conversion from 'en= um drbd_state_rv' to 'enum drbd_ret_code' [-Wenum-conversion] 2690 | retcode =3D conn_request_state(connection, NS(conn, C_UNCONNECTED)= , CS_VERBOSE); | ^ drivers/block/drbd/drbd_nl.c: In function 'drbd_adm_disconnect': drivers/block/drbd/drbd_nl.c:2803:11: warning: implicit conversion from 'en= um drbd_state_rv' to 'enum drbd_ret_code' [-Wenum-conversion] 2803 | retcode =3D rv; /* FIXME: Type mismatch. */ | ^ In each case, both are passed into drbd_adm_finish(), which just takes a 32-bit integer and is happy with either, presumably intentionally. Restructure the code to pass either type directly in there in most cases, avoiding the warnings. Signed-off-by: Arnd Bergmann Reviewed-by: Christoph B=C3=B6hmwalder --- drivers/block/drbd/drbd_nl.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 02030c9c4d3b..074b884ec225 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -770,6 +770,7 @@ int drbd_adm_set_role(struct sk_buff *skb, struct genl_= info *info) struct set_role_parms parms; int err; enum drbd_ret_code retcode; + enum drbd_state_rv rv; =20 retcode =3D drbd_adm_prepare(&adm_ctx, skb, info, DRBD_ADM_NEED_MINOR); if (!adm_ctx.reply_skb) @@ -790,14 +791,14 @@ int drbd_adm_set_role(struct sk_buff *skb, struct gen= l_info *info) mutex_lock(&adm_ctx.resource->adm_mutex); =20 if (info->genlhdr->cmd =3D=3D DRBD_ADM_PRIMARY) - retcode =3D (enum drbd_ret_code)drbd_set_role(adm_ctx.device, - R_PRIMARY, parms.assume_uptodate); + rv =3D drbd_set_role(adm_ctx.device, R_PRIMARY, parms.assume_uptodate); else - retcode =3D (enum drbd_ret_code)drbd_set_role(adm_ctx.device, - R_SECONDARY, 0); + rv =3D drbd_set_role(adm_ctx.device, R_SECONDARY, 0); =20 mutex_unlock(&adm_ctx.resource->adm_mutex); genl_lock(); + drbd_adm_finish(&adm_ctx, info, rv); + return 0; out: drbd_adm_finish(&adm_ctx, info, retcode); return 0; @@ -2502,6 +2503,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl= _info *info) struct drbd_resource *resource; struct drbd_connection *connection; enum drbd_ret_code retcode; + enum drbd_state_rv rv; int i; int err; =20 @@ -2621,12 +2623,11 @@ int drbd_adm_connect(struct sk_buff *skb, struct ge= nl_info *info) } rcu_read_unlock(); =20 - retcode =3D (enum drbd_ret_code)conn_request_state(connection, - NS(conn, C_UNCONNECTED), CS_VERBOSE); + rv =3D conn_request_state(connection, NS(conn, C_UNCONNECTED), CS_VERBOSE= ); =20 conn_reconfig_done(connection); mutex_unlock(&adm_ctx.resource->adm_mutex); - drbd_adm_finish(&adm_ctx, info, retcode); + drbd_adm_finish(&adm_ctx, info, rv); return 0; =20 fail: @@ -2734,11 +2735,12 @@ int drbd_adm_disconnect(struct sk_buff *skb, struct= genl_info *info) =20 mutex_lock(&adm_ctx.resource->adm_mutex); rv =3D conn_try_disconnect(connection, parms.force_disconnect); - if (rv < SS_SUCCESS) - retcode =3D (enum drbd_ret_code)rv; - else - retcode =3D NO_ERROR; mutex_unlock(&adm_ctx.resource->adm_mutex); + if (rv < SS_SUCCESS) { + drbd_adm_finish(&adm_ctx, info, rv); + return 0; + } + retcode =3D NO_ERROR; fail: drbd_adm_finish(&adm_ctx, info, retcode); return 0; --=20 2.35.1 From nobody Fri Jun 19 07:18:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEEE8C433F5 for ; Wed, 6 Apr 2022 20:52:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234727AbiDFUwe (ORCPT ); Wed, 6 Apr 2022 16:52:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233554AbiDFUvf (ORCPT ); Wed, 6 Apr 2022 16:51:35 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 614123CBF30 for ; Wed, 6 Apr 2022 12:07:35 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id l26so6294069ejx.1 for ; Wed, 06 Apr 2022 12:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0vcoWpko5M6BsO9WO6BZaEztSvAjnr2wIhZH0Y0nwWU=; b=mi8paDeGJ9FgOE5KAUIYIDlCD6t9WRIXW8Zbxzongj6zFKj7quoAet0fhWDUc5SmZZ xayddIqSEyI7Dea/HQIrpqGu5yheJHlfO1suXNQxYPDr5klhiDG31V04CeBKUxei7+ca 0uTdz7MsCQGNpsEQ70paHowFP/DBIK5J6Fj6tWvzXh/hUpmCtlYstrUvlG+Xi7Rdloz/ N3iDKbQcXbxEI5pj/fUur06ak9ZOnuD6GrGbyxTMSB+111T9S1hz1sv8/cNJS7W1FVSm rbKM2LzDMGzWgcX65SRXCJqlKq3vguzKAH5r7POFaeMyJ13qps80aqz+e8GmhQpmmike 4C4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0vcoWpko5M6BsO9WO6BZaEztSvAjnr2wIhZH0Y0nwWU=; b=5qyWNB70FYQ9HHJsiRXZ7wIKwIgdGEfRNjuHHfwIiQqRzymyb40QwvTpTyr79zPktB J/kNXNDRoxfDcrRWrgwaablabzivaDIv3DBH8uJHyMQ7eM0KgAUBaw+uaek1F8BWj01v U1VCdbV5yddPLjjiX68pE4FX+xOTmaHcCdexM61CL1GxuJJLIa+rGhUzgSeJ+fZ/bb6n rKwEO48OLGPHtCa/P0rM1DFnVwpOynLJPdtWQjR5nW1iQ6yc/4C/fT6lgUui/q9deI3g Ls7CKMar1KtdQIuSLoUmPpTz3IUgCXdOY0qDydSRcnvX1Dm4uYBYOVOQbfoIgpxBMOXI AaTQ== X-Gm-Message-State: AOAM530bsS7a5E8T/KR0Z7wo3CLFgTlH/1dchNdOtg01eztpqkmXb+JB v+bQvbGCiC0EHJ9lvcj3PiQ3/Q== X-Google-Smtp-Source: ABdhPJwS75mCEvIsWowddkngt4NmRn8+jLBJvmrzPpQ7wLwXC5KAdkj6Vik6DmpRxwMlJAQJjznehg== X-Received: by 2002:a17:907:6da3:b0:6e6:ec5e:c2f7 with SMTP id sb35-20020a1709076da300b006e6ec5ec2f7mr9677283ejc.309.1649272053940; Wed, 06 Apr 2022 12:07:33 -0700 (PDT) Received: from localhost (85-127-190-169.dsl.dynamic.surfer.at. [85.127.190.169]) by smtp.gmail.com with ESMTPSA id n5-20020a1709065e0500b006e4dae9b1besm6503475eju.145.2022.04.06.12.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:07:33 -0700 (PDT) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, Jiapeng Chong , Abaci Robot , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= Subject: [PATCH 3/7] block: drbd: drbd_receiver: Remove redundant assignment to err Date: Wed, 6 Apr 2022 21:07:11 +0200 Message-Id: <20220406190715.1938174-4-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> References: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiapeng Chong Variable err is set to '-EIO' but this value is never read as it is overwritten or not used later on, hence it is a redundant assignment and can be removed. Clean up the following clang-analyzer warning: drivers/block/drbd/drbd_receiver.c:3955:5: warning: Value stored to 'err' is never read [clang-analyzer-deadcode.DeadStores]. Reported-by: Abaci Robot Signed-off-by: Jiapeng Chong Acked-by: Christoph B=C3=B6hmwalder --- drivers/block/drbd/drbd_receiver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_r= eceiver.c index 08da922f81d1..911c26753556 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3903,7 +3903,6 @@ static int receive_SyncParam(struct drbd_connection *= connection, struct packet_i drbd_err(device, "verify-alg of wrong size, " "peer wants %u, accepting only up to %u byte\n", data_size, SHARED_SECRET_MAX); - err =3D -EIO; goto reconnect; } =20 --=20 2.35.1 From nobody Fri Jun 19 07:18:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB3C0C4332F for ; Wed, 6 Apr 2022 20:51:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232509AbiDFUxS (ORCPT ); Wed, 6 Apr 2022 16:53:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230028AbiDFUvj (ORCPT ); Wed, 6 Apr 2022 16:51:39 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBCA53CBF38 for ; Wed, 6 Apr 2022 12:07:36 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id r13so6261381ejd.5 for ; Wed, 06 Apr 2022 12:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8LQaWUct48NS9KOzqSJyG6Q8nrCLvO/0d/8JaBy+8UI=; b=8TLmi9yBHa5xfLlHJtNCWx/79qp4+wuKkyxTxgSZtFc2EXW66RIEfopio1Yw+IBGtI 6zrd5FaUZBKsPWNz7OcfX4S8P/YnO6QAQsUVEIP8ecGjtCTCwGvutCrVx7+QzVtjDmo4 vDA3YxoKJixzsVnvWjfdYRN2iLRa7hBuqURTaxUrLei+2EAA1QYn6SdisYjJFh1oalQT WfnTDmBuLl53v1JN5NavC3N5mpE2QkeT9bRWdMFUesnvBV4W9OLhmzE2tQUrooRgOY0p iIRanPlPSedLVXDBbtP2wmNAqqk05QBOTOzOTgU/fqykRCZGO+fJcwCyjEQD0Nlp/ijn gYCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8LQaWUct48NS9KOzqSJyG6Q8nrCLvO/0d/8JaBy+8UI=; b=HMl2dxhm1ztvYn51KQn0l+inIAsZr4xujhtli9V3YvdanxOmMscWuSTl8oJ01wDqsp j0fkw2B9w0WGdOCIKeOcih/syT/SBJolTIN3rmy+VNr451OeuvS3mobC2YwbvXAwHbhi usRis/qTPy9s1L/W47I2LTeJO/YlsuNxeYmvR7SsJpDO8D6fKPeTa/QOvJe/dXdOgWOx +zMsJnO3s1H2rD4778HmKg5R0XOjWKIPHhIxnuKXRLqO+kQtwcbXYa0Y2viQlssJNuXe hOJfr+NyLdMYER51krS/SfW4fFAPTvYPewvbPRWOASTCxr2H62exBgV5/MyYbtB9U6lA tj2g== X-Gm-Message-State: AOAM5310AatH1HBjbm6oZ7zoEaE9Zyt1PNGHp8jPVxDS1RuMKMTjXK+B hDlV1aBpkaeuL54DLIVTFdGCKw== X-Google-Smtp-Source: ABdhPJwRJutJaI7ufjruNvQEHwLj2pj6On47DxDImFWmez6E6EnVTp6BuR7eMlhnvrAAGLTGDlyZjA== X-Received: by 2002:a17:907:1c9e:b0:6e0:2fed:869a with SMTP id nb30-20020a1709071c9e00b006e02fed869amr9619973ejc.122.1649272055250; Wed, 06 Apr 2022 12:07:35 -0700 (PDT) Received: from localhost (85-127-190-169.dsl.dynamic.surfer.at. [85.127.190.169]) by smtp.gmail.com with ESMTPSA id q2-20020a170906144200b006ceb8723de9sm6853732ejc.120.2022.04.06.12.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:07:34 -0700 (PDT) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, Cai Huoqing , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= Subject: [PATCH 4/7] drbd: Make use of PFN_UP helper macro Date: Wed, 6 Apr 2022 21:07:12 +0200 Message-Id: <20220406190715.1938174-5-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> References: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cai Huoqing it's a refactor to make use of PFN_UP helper macro Signed-off-by: Cai Huoqing Reviewed-by: Christoph B=C3=B6hmwalder --- drivers/block/drbd/drbd_bitmap.c | 2 +- drivers/block/drbd/drbd_receiver.c | 4 ++-- drivers/block/drbd/drbd_worker.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bit= map.c index df25eecf80af..9e060e49b3f8 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c @@ -683,7 +683,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t= capacity, int set_new_bi } } =20 - want =3D ALIGN(words*sizeof(long), PAGE_SIZE) >> PAGE_SHIFT; + want =3D PFN_UP(words*sizeof(long)); have =3D b->bm_number_of_pages; if (want =3D=3D have) { D_ASSERT(device, b->bm_pages !=3D NULL); diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_r= eceiver.c index 911c26753556..c6c1843452ba 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -364,7 +364,7 @@ drbd_alloc_peer_req(struct drbd_peer_device *peer_devic= e, u64 id, sector_t secto struct drbd_device *device =3D peer_device->device; struct drbd_peer_request *peer_req; struct page *page =3D NULL; - unsigned nr_pages =3D (payload_size + PAGE_SIZE -1) >> PAGE_SHIFT; + unsigned nr_pages =3D PFN_UP(payload_size); =20 if (drbd_insert_fault(device, DRBD_FAULT_AL_EE)) return NULL; @@ -1631,7 +1631,7 @@ int drbd_submit_peer_request(struct drbd_device *devi= ce, sector_t sector =3D peer_req->i.sector; unsigned data_size =3D peer_req->i.size; unsigned n_bios =3D 0; - unsigned nr_pages =3D (data_size + PAGE_SIZE -1) >> PAGE_SHIFT; + unsigned nr_pages =3D PFN_UP(data_size); =20 /* TRIM/DISCARD: for now, always use the helper function * blkdev_issue_zeroout(..., discard=3Dtrue). diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_wor= ker.c index 0f9956f4e9c4..af3051dd8912 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -1030,7 +1030,7 @@ static void move_to_net_ee_or_free(struct drbd_device= *device, struct drbd_peer_ { if (drbd_peer_req_has_active_page(peer_req)) { /* This might happen if sendpage() has not finished */ - int i =3D (peer_req->i.size + PAGE_SIZE -1) >> PAGE_SHIFT; + int i =3D PFN_UP(peer_req->i.size); atomic_add(i, &device->pp_in_use_by_net); atomic_sub(i, &device->pp_in_use); spin_lock_irq(&device->resource->req_lock); --=20 2.35.1 From nobody Fri Jun 19 07:18:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27828C433F5 for ; Wed, 6 Apr 2022 20:50:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232654AbiDFUwA (ORCPT ); Wed, 6 Apr 2022 16:52:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233049AbiDFUve (ORCPT ); Wed, 6 Apr 2022 16:51:34 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 020CE3CBF3C for ; Wed, 6 Apr 2022 12:07:38 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id b15so3807571edn.4 for ; Wed, 06 Apr 2022 12:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TnUktBxvt8+vZXxb7vXGqvLd54peL2xRpiiuPoGFnkk=; b=RTjQs8filYk4C4QQnW6B2lyt27Gc5MyDO2AWKp3UlCdUISg90K1O9Hav0/7pdY97gl b0nlFnS7D8D+7bfLJNpuq25U9xZYXGoh3G+vn96SLCdeBEmXa9/N4EYLpCIrk790sjwh Eyicd/11fMeVgIm1IvCKoca+kw4pE34D5v15p5Xsn/pHZTxAvKYFS2jGGgkEqbsGgXK5 znTMf2671Efgm6HThOvVkCyYDmyJcscyHfEVjFUgZOkLW8Zb5ty0Lw/KcvBaAYpkHP8c uY5orEeRzQcUztWB1myK7izLj8q93jCf3Rd5lHScKNZ2TsWUwGeiOVY7oVgFDoXLVVSK HCAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TnUktBxvt8+vZXxb7vXGqvLd54peL2xRpiiuPoGFnkk=; b=DeuG2YLma0DbD1XDAXwFT0rpAZX1NZo9ynLer4HrKFDMG5nFtOwiot6ULv4eC+Xro3 VVRJPLu0g7SEbLOUQuPH6v2vSBav9Sr7//YViw1V4OsLeR3U4efRAIIwVmYK5W9hSuKM 6xAYmc9GPeGIy6zOUS/yhcOKNJ1iJn2L51wAwW1xHN1rTzYycFBlvsKGoz8dFCd/qlN8 +HAmDeBmitq9u8e4patKa853wxcalhSQR7vadhY4zZkq7OF2yepzrSfRd0GxoYkMPlf4 07k2UfoPpIUxuCed9jyE8W4GBOn8P76rmoVvkZDbUv6L7CQ2V1gDJgzHPlLG3DyoE3IN Go/A== X-Gm-Message-State: AOAM5307natrTDTwv4X/EB7H+9VilRJ3i0VkFXr86kYa7BC0+qzPWSQr 6eBhz2ogtbZNRTJ0WpDSoPhgWafczvf8VquY9YA= X-Google-Smtp-Source: ABdhPJxx9ngsTndlvSdykCBzt140ypyzhYFDLBaN1Ud/EcD94rJa1p1GXvY0GkN6S1lJk4ud48Suuw== X-Received: by 2002:a05:6402:2687:b0:419:1f59:19c4 with SMTP id w7-20020a056402268700b004191f5919c4mr10447356edd.255.1649272056533; Wed, 06 Apr 2022 12:07:36 -0700 (PDT) Received: from localhost (85-127-190-169.dsl.dynamic.surfer.at. [85.127.190.169]) by smtp.gmail.com with ESMTPSA id er22-20020a170907739600b006e7e873ed6csm4323534ejc.53.2022.04.06.12.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:07:36 -0700 (PDT) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, Cai Huoqing , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= Subject: [PATCH 5/7] drbd: Replace "unsigned" with "unsigned int" Date: Wed, 6 Apr 2022 21:07:13 +0200 Message-Id: <20220406190715.1938174-6-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> References: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cai Huoqing when run checkpath.pl for the first patch, found that WARNING: Prefer 'unsigned int' to bare use of 'unsigned'. so fix it. BTW Signed-off-by: Cai Huoqing Acked-by: Christoph B=C3=B6hmwalder --- drivers/block/drbd/drbd_receiver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_r= eceiver.c index c6c1843452ba..0825766ce910 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -364,7 +364,7 @@ drbd_alloc_peer_req(struct drbd_peer_device *peer_devic= e, u64 id, sector_t secto struct drbd_device *device =3D peer_device->device; struct drbd_peer_request *peer_req; struct page *page =3D NULL; - unsigned nr_pages =3D PFN_UP(payload_size); + unsigned int nr_pages =3D PFN_UP(payload_size); =20 if (drbd_insert_fault(device, DRBD_FAULT_AL_EE)) return NULL; @@ -1629,9 +1629,9 @@ int drbd_submit_peer_request(struct drbd_device *devi= ce, struct bio *bio; struct page *page =3D peer_req->pages; sector_t sector =3D peer_req->i.sector; - unsigned data_size =3D peer_req->i.size; - unsigned n_bios =3D 0; - unsigned nr_pages =3D PFN_UP(data_size); + unsigned int data_size =3D peer_req->i.size; + unsigned int n_bios =3D 0; + unsigned int nr_pages =3D PFN_UP(data_size); =20 /* TRIM/DISCARD: for now, always use the helper function * blkdev_issue_zeroout(..., discard=3Dtrue). --=20 2.35.1 From nobody Fri Jun 19 07:18:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11D09C433F5 for ; Wed, 6 Apr 2022 20:51:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234734AbiDFUxm (ORCPT ); Wed, 6 Apr 2022 16:53:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234488AbiDFUvn (ORCPT ); Wed, 6 Apr 2022 16:51:43 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 440703CBF3E for ; Wed, 6 Apr 2022 12:07:39 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id g22so3817638edz.2 for ; Wed, 06 Apr 2022 12:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=POlr1a0iTGBoJ3bnuukX0R50RftAjAl0lTvKR+vp4fE=; b=lsMjsM8hxfLRElDhpBGCBQAWVxHPdgBMTP0fgUwIURdERrRguIPnGMBktd9IeLNUl0 QTSMQCDikvX/cPN4g0moz7n7yXWOVjRvKJpzHbdmQloqYiAZ7qGSl0P1uWyEnLMl7bcJ HVIl/2ATefvZPve2FGSxSnvynVBVVDeGqyCmU51duL5Gz88iDLthmoj7DrGz/XEBVeJx TfUA1W0R58CKFNnbhiFvGEoZyqocemong5+RmVpQYF7FkgQk/ygaQM2FubSmPfq2UFvt o3/f9QlfBKhhliDJUZ9nKbRTy8tu9dd4L1S+zc3gkU7pgvMH20Mnegiwv2iqGAk32ZGC K2tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=POlr1a0iTGBoJ3bnuukX0R50RftAjAl0lTvKR+vp4fE=; b=0ryhV3mEo96ysgswOImm5UB6UVpA6d1CVbke9ZyXtDgyZ5XmsmcgVGDRTw+5V12ceC zlqIktVrPDlo0t9pZV8aKNq9EUetXA+jm9e6Y/bLnWiit6AdIRvNFONDH4EdKGYcWIgI 2PveEak8PMEYSlpyuf143ProFNdl1UlWKYfagw5Gdsr/YmLITdFFFGbBaHC1ifG5JD+f ZLqNFiPL7fEULXIvudxUCOJ+5P9uohEwxuZAu9nMOkC9JcRFfcTait5vQjZ9qU4ap6Ci QCL2a4YWW9z2g2SAifHq4x+0noCPLzsqviN95FTNxVsLNx2w19xw1m3xOmoBB98NZWuZ A1iw== X-Gm-Message-State: AOAM530eYxpyNYxiHFgUOM0mGUcnlCBXyzQvcSyIZFxrxQ0LvD1b+3RC k2LHkK8noG2va2c19dtnM7LARg== X-Google-Smtp-Source: ABdhPJyO9677zCd7VbzMR7POWXOfRfPVkPceRUPrJkIhga3FMwv044ystxo1E0V0UEFKxVx4KhhlTA== X-Received: by 2002:a05:6402:2050:b0:41c:dd5e:3c63 with SMTP id bc16-20020a056402205000b0041cdd5e3c63mr10339789edb.56.1649272057830; Wed, 06 Apr 2022 12:07:37 -0700 (PDT) Received: from localhost (85-127-190-169.dsl.dynamic.surfer.at. [85.127.190.169]) by smtp.gmail.com with ESMTPSA id c3-20020a17090654c300b006e4e1a3e9d5sm6404685ejp.144.2022.04.06.12.07.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:07:37 -0700 (PDT) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, "Uladzislau Rezki (Sony)" , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= Subject: [PATCH 6/7] drdb: Switch to kvfree_rcu() API Date: Wed, 6 Apr 2022 21:07:14 +0200 Message-Id: <20220406190715.1938174-7-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> References: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Uladzislau Rezki (Sony)" Instead of invoking a synchronize_rcu() to free a pointer after a grace period we can directly make use of new API that does the same but in more efficient way. TO: Jens Axboe TO: Philipp Reisner TO: Jason Gunthorpe TO: drbd-dev@lists.linbit.com TO: linux-block@vger.kernel.org Signed-off-by: Uladzislau Rezki (Sony) Reviewed-by: Christoph B=C3=B6hmwalder --- drivers/block/drbd/drbd_nl.c | 9 +++------ drivers/block/drbd/drbd_receiver.c | 6 ++---- drivers/block/drbd/drbd_state.c | 3 +-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 074b884ec225..ad6e40864b37 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -1612,8 +1612,7 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct ge= nl_info *info) drbd_send_sync_param(peer_device); } =20 - synchronize_rcu(); - kfree(old_disk_conf); + kvfree_rcu(old_disk_conf); kfree(old_plan); mod_timer(&device->request_timer, jiffies + HZ); goto success; @@ -2444,8 +2443,7 @@ int drbd_adm_net_opts(struct sk_buff *skb, struct gen= l_info *info) =20 mutex_unlock(&connection->resource->conf_update); mutex_unlock(&connection->data.mutex); - synchronize_rcu(); - kfree(old_net_conf); + kvfree_rcu(old_net_conf); =20 if (connection->cstate >=3D C_WF_REPORT_PARAMS) { struct drbd_peer_device *peer_device; @@ -2859,8 +2857,7 @@ int drbd_adm_resize(struct sk_buff *skb, struct genl_= info *info) new_disk_conf->disk_size =3D (sector_t)rs.resize_size; rcu_assign_pointer(device->ldev->disk_conf, new_disk_conf); mutex_unlock(&device->resource->conf_update); - synchronize_rcu(); - kfree(old_disk_conf); + kvfree_rcu(old_disk_conf); new_disk_conf =3D NULL; } =20 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_r= eceiver.c index 0825766ce910..5e10572a4d3e 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3751,8 +3751,7 @@ static int receive_protocol(struct drbd_connection *c= onnection, struct packet_in drbd_info(connection, "peer data-integrity-alg: %s\n", integrity_alg[0] ? integrity_alg : "(none)"); =20 - synchronize_rcu(); - kfree(old_net_conf); + kvfree_rcu(old_net_conf); return 0; =20 disconnect_rcu_unlock: @@ -4120,8 +4119,7 @@ static int receive_sizes(struct drbd_connection *conn= ection, struct packet_info =20 rcu_assign_pointer(device->ldev->disk_conf, new_disk_conf); mutex_unlock(&connection->resource->conf_update); - synchronize_rcu(); - kfree(old_disk_conf); + kvfree_rcu(old_disk_conf); =20 drbd_info(device, "Peer sets u_size to %lu sectors (old: %lu)\n", (unsigned long)p_usize, (unsigned long)my_usize); diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_stat= e.c index b8a27818ab3f..826e496821c7 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -2071,8 +2071,7 @@ static int w_after_conn_state_ch(struct drbd_work *w,= int unused) conn_free_crypto(connection); mutex_unlock(&connection->resource->conf_update); =20 - synchronize_rcu(); - kfree(old_conf); + kvfree_rcu(old_conf); } =20 if (ns_max.susp_fen) { --=20 2.35.1 From nobody Fri Jun 19 07:18:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 093CBC433F5 for ; Wed, 6 Apr 2022 20:51:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232946AbiDFUxV (ORCPT ); Wed, 6 Apr 2022 16:53:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232093AbiDFUwE (ORCPT ); Wed, 6 Apr 2022 16:52:04 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77A533CBF3F for ; Wed, 6 Apr 2022 12:07:40 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id r10so3814095eda.1 for ; Wed, 06 Apr 2022 12:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x6Z98lJKXuS91zE/lsKZc5fIxCcxTcDsBFNfuGVittc=; b=eo1ARq8XmDt4WJEG0fNRv1dh9ZyUYCvrTijwHC867kmZU3IKD5dL6KdP6iczPp7pQy tnHgSGg3MfdBTqOVO2b3wHz1Z1mFb8Wy98zw0SLKqmDjHRE/4/DbCsgTBy7NOY5paS8p nijBU4Ij7aZfaQxXvIOGZwEYAEJTEbOiT2lyhnYGBEja+bnssGEBiy65Dw46FE2/H9UV imNJlRPrr05hmPE64cmvbNhcIp4UPW+Qk3Y1ciKA1Tx83BjewM3t9IBYibMz3dVMHHKn uH8gkqbRDc2yw+GEAn0188l22b0ZHzaEI+RGp7WxxHsGJ5OBspo1dMpXv1v3j5kAjIoG nv8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x6Z98lJKXuS91zE/lsKZc5fIxCcxTcDsBFNfuGVittc=; b=gM8MtjHYSPR4v8JPP1bzKEG39wjsmJKRyeflXnnyQMQAXTaGEESkHce0MofbhRmHYf sHyqVvhZToNlDbkFkqAy3AUKnUWzM5iFEOMNBbiZtDSuhnrnba/uAM//vkTWXPTc3gJB tuxLRwwhu9u9cn1mUc+7GK221QnInqHIyRfBXBAptyAJ38taIhjt+ON/GUDv6aquNQfO 3B5Yzp0thRpwndQBM07tUZ8xccQPaqYCk7LEVkyhVALA1Hfal8ow+F+iJLxBvox7KReF hTdkRh7nZF8cCbR2WqZb9yhuOOdKKcMPyPWnLprB/cQX6oN0Ps2Znds2sSCSmko5iCLh ij5A== X-Gm-Message-State: AOAM530Y8L3OAJrHRN9JC5eF3xjVYXS81NdhXeqhOAJ6qenrmb5QleyI w5+jx275ZE1AxZhTcVBW4E3OUg== X-Google-Smtp-Source: ABdhPJziYZNh8lETm/Afxn5OVMjYG1YbWRgvE9PR7ajZDuxwzBFio8OijpeIWLus8bx4HMB+EFR/ag== X-Received: by 2002:a05:6402:430d:b0:419:45cd:7ab1 with SMTP id m13-20020a056402430d00b0041945cd7ab1mr10233378edc.367.1649272059049; Wed, 06 Apr 2022 12:07:39 -0700 (PDT) Received: from localhost (85-127-190-169.dsl.dynamic.surfer.at. [85.127.190.169]) by smtp.gmail.com with ESMTPSA id gg7-20020a170906e28700b006e73ac96f99sm4886409ejb.224.2022.04.06.12.07.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:07:38 -0700 (PDT) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, Haowen Bai , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= Subject: [PATCH 7/7] drbd: Return true/false (not 1/0) from bool functions Date: Wed, 6 Apr 2022 21:07:15 +0200 Message-Id: <20220406190715.1938174-8-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> References: <20220406190715.1938174-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Haowen Bai Return boolean values ("true" or "false") instead of 1 or 0 from bool functions. This fixes the following warnings from coccicheck: ./drivers/block/drbd/drbd_req.c:912:9-10: WARNING: return of 0/1 in function 'remote_due_to_read_balancing' with return type bool Signed-off-by: Haowen Bai Reviewed-by: Christoph B=C3=B6hmwalder --- drivers/block/drbd/drbd_req.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 75be0e16770a..e64bcfba30ef 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -922,7 +922,7 @@ static bool remote_due_to_read_balancing(struct drbd_de= vice *device, sector_t se =20 switch (rbm) { case RB_CONGESTED_REMOTE: - return 0; + return false; case RB_LEAST_PENDING: return atomic_read(&device->local_cnt) > atomic_read(&device->ap_pending_cnt) + atomic_read(&device->rs_pending_= cnt); --=20 2.35.1