Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp1515615rdh; Mon, 25 Sep 2023 15:36:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyez9/QXzrbEnMVpRHsu1izcjyFCF3t3LiJdGK/dJt3eyBrLOf5eJjkc0mgMoNng3W+2Iw X-Received: by 2002:a17:902:7d96:b0:1c5:f4c7:b4e4 with SMTP id a22-20020a1709027d9600b001c5f4c7b4e4mr6182422plm.39.1695681408998; Mon, 25 Sep 2023 15:36:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695681408; cv=none; d=google.com; s=arc-20160816; b=rsaOFSEuK9u18PE+zNPaaiHZnTLg9fzSzTJESZQjSPBhIK5UdJQFHlqyzYhc1nxcCQ gyasngU7ox/EZQ8iNfasRYUEe7l3a23V8Z90QVpuVcvcAylPUDGW+OcU+thUkXVaokXD eFPPbN8fBKmSoe6Fy96dh4aiHcrCcP7WwsJBc60gEUBQD5ebTsmYR5iOatzww0ep4IEl kZfeHROGBxDi+nmgSh+a9MBFHBcpZ0EnL5CfFaJhlmc3tNqJzm/5qmeGZaWYbhgP22wK DUP0NlM6m8TkI5pp5rNIBkB34jEUMMBXuv8+ddSKW0GKwPRjbAaBUZdK4Rkec8xI/Ss/ n5og== 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=oQjxv/qWpzFGTlwOWGQlwUCcgnofDI2I99l4qJgz63Y=; fh=dzqEI/am1IoNVOMZmTOChre3TckBGjOgtLT35fkBuy0=; b=oZz/ltHR3S10TwbNElNIB95vIF4BoCsiHbKNqjrHHOG2uDeSgEtJPkHiin2x/IYhyw Fg19EQXJTf2kQlJVCeipgFJ3oXsbMemVzlhTOGPliTrTFgoeqnUfH9JgNxVaKZJ6qM9y fb0TpG6zf0qW/RcbqUN0QlINL62ij8MMceC6CbdP5WwhINkAOLaE0rnIi9KngIKpwzhh CU2Qt66F7EcP4mZbvm52Oo7SA34kNHB8diMxap4P5Eo6RNK0INO7nJa0ug9mfTQLDv0L xF/hfAqp/vq/FgBSQ0ki6788hV8B1hHV7cQUMKA23jYANCSj/3lSkQQPUTOZzNvjMFzD yKjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OoX5cCzC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id z17-20020a170903019100b001c6138350b4si4341279plg.431.2023.09.25.15.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 15:36:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OoX5cCzC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 813E88070797; Mon, 25 Sep 2023 05:05:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231338AbjIYMFG (ORCPT + 99 others); Mon, 25 Sep 2023 08:05:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231356AbjIYMFD (ORCPT ); Mon, 25 Sep 2023 08:05:03 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4174111 for ; Mon, 25 Sep 2023 05:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695643413; 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=oQjxv/qWpzFGTlwOWGQlwUCcgnofDI2I99l4qJgz63Y=; b=OoX5cCzCD5DByMI6M1gB75EF4mn87MX4zoDu4pM/ozBbQDpaAbVjHcVeXEOIoVxPrdTgS3 PhLi2XogGNZxThcAdXF/EpRY2Ql/h1sJ5tuuIB2lvOJpI4CwyKkxmmIfUviWUlV2pdixMW 1yhDb59yK+TON0VM5ldDA065h3bK3yM= 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-269-DNPjLMOqM3-blp0lhNFq-g-1; Mon, 25 Sep 2023 08:03:31 -0400 X-MC-Unique: DNPjLMOqM3-blp0lhNFq-g-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB143101AA42; Mon, 25 Sep 2023 12:03:30 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D914711293; Mon, 25 Sep 2023 12:03:29 +0000 (UTC) From: David Howells To: Jens Axboe Cc: David Howells , Al Viro , Linus Torvalds , Christoph Hellwig , Christian Brauner , David Laight , Matthew Wilcox , Jeff Layton , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 05/12] iov_iter: Renumber ITER_* constants Date: Mon, 25 Sep 2023 13:03:02 +0100 Message-ID: <20230925120309.1731676-6-dhowells@redhat.com> In-Reply-To: <20230925120309.1731676-1-dhowells@redhat.com> References: <20230925120309.1731676-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 25 Sep 2023 05:05:15 -0700 (PDT) Renumber the ITER_* iterator-type constants to put things in the same order as in the iteration functions and to group user-backed iterators at the bottom. Signed-off-by: David Howells cc: Alexander Viro cc: Jens Axboe cc: Christoph Hellwig cc: Christian Brauner cc: Matthew Wilcox cc: Linus Torvalds cc: David Laight cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- include/linux/uio.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/uio.h b/include/linux/uio.h index 2000e42a6586..bef8e56aa45c 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -21,12 +21,12 @@ struct kvec { enum iter_type { /* iter types */ + ITER_UBUF, ITER_IOVEC, - ITER_KVEC, ITER_BVEC, + ITER_KVEC, ITER_XARRAY, ITER_DISCARD, - ITER_UBUF, }; #define ITER_SOURCE 1 // == WRITE