From patchwork Wed Sep 20 22:22:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13393498 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96FCECD13D3 for ; Wed, 20 Sep 2023 22:22:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A7E456B01A4; Wed, 20 Sep 2023 18:22:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A2FF16B01A5; Wed, 20 Sep 2023 18:22:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87F7C6B01A6; Wed, 20 Sep 2023 18:22:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6CF1F6B01A4 for ; Wed, 20 Sep 2023 18:22:57 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3E194160788 for ; Wed, 20 Sep 2023 22:22:57 +0000 (UTC) X-FDA: 81258401994.03.BCF1B4F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 83994140021 for ; Wed, 20 Sep 2023 22:22:55 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MFmIX2T9; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695248575; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=437kiFAHLHJfEBaWwZrq8WSevs6s9dyVAFCFY8Y8ee4=; b=dYE4mtNBsKG2e63RBAEKzjvQ4gFI/s4lKP4OgQO0KNuaRNKvNs0WKG0++Dn3h8O2vRgfQF nz7f0x9QGy1lb2bbl86+wmftxBnNxJKEJJAel8PhHuxmO9bE2D5Z7M6YaT6L1O3mlkbfTN IRjj6pNoWSAVo3p18QNwKN4SKLuAwMA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695248575; a=rsa-sha256; cv=none; b=hXLTv1MpZVpDWuQovj3gCCpNy4MOH/fZkVaBME63Ej3dO8Juu2h0BgdFQlpDhpWYk12ARP lcpBuqN1cBDptRE5HPT7W3U6HsL5Osk1TSBrvk41HBPZ+lTykq43biJDc5+Ly6rUXoCFqy 7YCzQ4s4sjOdjVKfAACSC8788DqSZaM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MFmIX2T9; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695248574; 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=437kiFAHLHJfEBaWwZrq8WSevs6s9dyVAFCFY8Y8ee4=; b=MFmIX2T9aUrDOKitCxGke2sq0ojgbaM4S+1AIUy7LQdubbPuE14qUt351az8H+S9ygrLEj FdUaLRXmYjXHFF2103AUvqxlWFoL1peZKLZNhF6FW3IqAgOceTcB7fKtOjywidVrj0TEuc w8T75v0mhvJ5trwUvz1XR6stFiwp/VY= 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-453-GGmAFyesMt6gNbnmBSrgrA-1; Wed, 20 Sep 2023 18:22:47 -0400 X-MC-Unique: GGmAFyesMt6gNbnmBSrgrA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 95FA1811E7D; Wed, 20 Sep 2023 22:22:46 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id F228340C2064; Wed, 20 Sep 2023 22:22:44 +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 v5 03/11] iov_iter: Renumber ITER_* constants Date: Wed, 20 Sep 2023 23:22:23 +0100 Message-ID: <20230920222231.686275-4-dhowells@redhat.com> In-Reply-To: <20230920222231.686275-1-dhowells@redhat.com> References: <20230920222231.686275-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Rspamd-Queue-Id: 83994140021 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 6tr13bzt9zq3qpo6zohxktwkw73hiay5 X-HE-Tag: 1695248575-542915 X-HE-Meta: U2FsdGVkX18gutL9iB4yeJxWzjlyhYZw/ZOHYHeKeghOkVtwRA5BOxcpTPPFVeJqbvXWPMCyc2dESzOnKJXE8+iETReSAxVcnzwePqn9A3w+T8vkeYh60PD1I2YuslPDh4ififj2a2FhGBaDRdnN7XsOIFXG+y0hOChcFaDx5JCZBRxssfNFIDlqy8q+jpuqJReZ2C4kro46a7QrkOT3oqmzgnQz1WL2iSjI1KhZcihU8hQnpyBun4yXhR0AzpfbDEb9WVuUE0lTxjcsoDSfOFP75qhPqDy1XsKpqMDIkPgZTDJQQeHtBcql3Z68hM5iW/MvTLDDu1tNFGZKWUFPl30N5kP6v3dsSRwAlevQ/g7uqByl+Naji1XF0k64G+2PAq2bJaWJ0Im/X29afxSm9gqHV/R6xv8GvBxexupPx8oE8dadKg290GveMLBQDaL4M7oLFRumIVJjOxiCok0pa8KzAPBiCdNK5gMnOTzEYbFZ7Lh2QeSEWx74QnU2SxV1eorPSX9YNUKe9SJrRtetpUbQYpuI1NjUxHfpNYb3UyziIknaEBmzpplgMTfpoYBw5fEmBVZu17227kuiSEueDLwBJ6ON3GAe+YMVNzZs3cgA58kIOc8yYc2vpFyVsI54S1OhdFO2TmEzOMjZkKMQe8JuIjGkjHfvFm7JptmxWTq2so7Re67s1etM8CEQz3gUGphaQ190Bf2EgeLnakp22ng8d1Dyf8JVNcC+ewo826fj5+PQds4G/A1DBZgyg1Wy8cWscBB+xqDn0WCk+0tC0PcXFCxZ4qI0zTLb+KZBMTwJi6tFBbcPyCTSSMAul9cQ6c2lW7C5BgMJ2aZf5te+DM+lk7uwrMlMDdByiZ8GEz3LTTZ2TFmSTD2Fq1dnkP3Qkcvds0RlklDeWcQ6UpiDjMBsWwPWzZx5/BFE4BxxkGWKFGVrCxzp4L5QQ5nUe1kbXl1sUWQdLr3+E6O/koC 0wqwfjVL mwEXeHQyYUXt8IzqtRY4RD9fpzhww7/g2l1oirKjQEP3MR/qSx8miuhoXjycjV/RxG5AdsT3GzkebKuVA8erwn/xlV5p/ylA5+akqzLoHdAHhOMJl6z/6nActzeqIDnbnUyTuKxn9aZ1wUJ2ZzqDVFxmngCp6tedQ9WPp4uXIo/Rf3doIUMaHafM4v5oU4LGG/5qzt4NSqqa2omHKNNo3jb7/HZY3+u1PrWjDcM6/ZS8OtAUuzuRgcuI7KT2/f3Az7T42XlEIcvYR4lR/E0DIsssigTkDxJdQTKStkITQlDWD8mH+QgS3XJJLuP1KxaFOt9Ua2UWlwgNekbcLSmiAni4j8uQKJ6f4w/WOA7Oeyn1p0c5rDcSNKZbl4dR/UohRW0RjjXRkSQJ7CQDaczaE7HXQH/oJ4HbPtwTBzXxOyPAV4Age05oi1M/XUMhttSa5+bHzwT9qTgnrtxDCPIRkVbwFTvQpwNRk6xVpXuggZEcngJwS4FyUk52dmiXnpKHc4FRBH4GKG116HJw43ktVCUE9hlxUCECM2E77tR+RAU2wFaXEf96zdRXeJegutMWjLekyS831hIgqvo8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 42bce38a8e87..d1801c46e89e 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