From patchwork Wed May 13 07:07:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 11545235 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 38A0914B4 for ; Wed, 13 May 2020 07:07:54 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1B54206F5 for ; Wed, 13 May 2020 07:07:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="e6B8txLV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1B54206F5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589353672; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Tv8XYPeRyzOKlz3OrdkLJcV2yscukfoQF/ySdAZ6cGs=; b=e6B8txLVGXKByJcFajMlj+m51gyenNvXekhDgYiZ/+4QpSWmlqOKibhxYi3H5XA2jehA/0 /cIec7j0wPgSER+D7rTxOXIl1ld7FMexnlgevWzOmv/NIR96OkuWNZo60kOnCfpjjI8gQn z1oDJ4YZfmk6bU92zxz2TGE4GoE+xoM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-34-F443RyBUMrecnxkjIhrcHw-1; Wed, 13 May 2020 03:07:50 -0400 X-MC-Unique: F443RyBUMrecnxkjIhrcHw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D0706107B273; Wed, 13 May 2020 07:07:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1241D60C05; Wed, 13 May 2020 07:07:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 72B454CAA0; Wed, 13 May 2020 07:07:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04D77exL025849 for ; Wed, 13 May 2020 03:07:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D5122166BA3; Wed, 13 May 2020 07:07:40 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8922B2166BA0 for ; Wed, 13 May 2020 07:07:37 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D8E8C811E77 for ; Wed, 13 May 2020 07:07:37 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-346-GfwDmwLHM8isyiDfLBjyFA-1; Wed, 13 May 2020 03:07:35 -0400 X-MC-Unique: GfwDmwLHM8isyiDfLBjyFA-1 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 42612B080; Wed, 13 May 2020 07:07:36 +0000 (UTC) From: Hannes Reinecke To: Mike Snitzer Date: Wed, 13 May 2020 09:07:28 +0200 Message-Id: <20200513070729.71461-2-hare@suse.de> In-Reply-To: <20200513070729.71461-1-hare@suse.de> References: <20200513070729.71461-1-hare@suse.de> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: dm-devel@redhat.com Cc: Damien LeMoal , dm-devel@redhat.com Subject: [dm-devel] [PATCH 1/2] dm-zoned: invert zone check in dmz_reset_zone() X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Instead of excluding invalid zones we should check if the zone is sequential and exclude invalid states. That way we don't need to touch the selection when new zone states or flags are added. Signed-off-by: Hannes Reinecke Reviewed-by: Damien Le Moal --- drivers/md/dm-zoned-metadata.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c index d9e256762eff..9b93d7ff1dfc 100644 --- a/drivers/md/dm-zoned-metadata.c +++ b/drivers/md/dm-zoned-metadata.c @@ -1570,12 +1570,16 @@ static int dmz_reset_zone(struct dmz_metadata *zmd, struct dm_zone *zone) int ret; /* - * Ignore offline zones, read only zones, - * and conventional zones. + * Only check sequential zones. + */ + if (!dmz_is_seq(zone)) + return 0; + + /* + * But ignore offline and read only zones. */ if (dmz_is_offline(zone) || - dmz_is_readonly(zone) || - dmz_is_rnd(zone)) + dmz_is_readonly(zone)) return 0; if (!dmz_is_empty(zone) || dmz_seq_write_err(zone)) {