From patchwork Fri Sep 22 12:02:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13395703 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 6F31FC04AAB for ; Fri, 22 Sep 2023 12:02:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED34F6B02CB; Fri, 22 Sep 2023 08:02:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E81FE6B02CC; Fri, 22 Sep 2023 08:02:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFD8A6B02CD; Fri, 22 Sep 2023 08:02:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B924C6B02CB for ; Fri, 22 Sep 2023 08:02:53 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8E2621A1058 for ; Fri, 22 Sep 2023 12:02:53 +0000 (UTC) X-FDA: 81264097026.04.917A473 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id C8F1B100043 for ; Fri, 22 Sep 2023 12:02:51 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="DsCAw0U/"; spf=pass (imf14.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=1695384171; 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=oQjxv/qWpzFGTlwOWGQlwUCcgnofDI2I99l4qJgz63Y=; b=HYSyNc9L7lJOSp4/4vIvED1raL9psUyIX8vy+7UPIM8nzM4NHNvHTJdrxO4jkF6UPJH3ca /fTH9ogbyCQAI76xg4Iiti3naefLvRABXU0Ze+QdvYIXRIA3yR5EXHaopuBTBCFF2aTuZn mkxt1D/FKEOIhvorKV+J06Cfij/Sp/o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695384171; a=rsa-sha256; cv=none; b=dSInPbQRZE7ou+H8ye+5w386+nAEJ9MblWhPm8ISOth0alpL3Au3q9R+Y4/7GvOJa6Q8pJ UA3vtMKV7B76Qyb8oBycdgwCms6d5GxjCZLyNe7TejhQxzzw2LhDl7bba7X1ULWYZrhyfV aYY09AG9DYSybnFE6eGQjhEuIMBZ+2A= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="DsCAw0U/"; spf=pass (imf14.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=1695384171; 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=DsCAw0U/QkEjFbhuV0GnJV3ipW2KBE2veIKEyNx+4oFtPoWWSg0/r7xxnuT4OJz3vggb6D x4HFgttpsnJZn2zcDdFd+/tY0TzJA65lqbohGjMWUK9ZtqxovM/elEr0WDS2FcEJXPusNj 7NtFjJCwoASn+k3M0JWOU+a6GYUUj+o= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-383-AeRfjP2MMb6jmnzsRdIcog-1; Fri, 22 Sep 2023 08:02:46 -0400 X-MC-Unique: AeRfjP2MMb6jmnzsRdIcog-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 3B51B3C13505; Fri, 22 Sep 2023 12:02:45 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B15651E3; Fri, 22 Sep 2023 12:02:43 +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 v6 05/13] iov_iter: Renumber ITER_* constants Date: Fri, 22 Sep 2023 13:02:19 +0100 Message-ID: <20230922120227.1173720-6-dhowells@redhat.com> In-Reply-To: <20230922120227.1173720-1-dhowells@redhat.com> References: <20230922120227.1173720-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspamd-Queue-Id: C8F1B100043 X-Rspam-User: X-Stat-Signature: rqxqbfrzebnx9kth1mt1ad9c93dbm6b8 X-Rspamd-Server: rspam03 X-HE-Tag: 1695384171-97198 X-HE-Meta: U2FsdGVkX19AsEYra6+r0PvFTmlFba1LjfJiiDWx/VKGLVZuQrMM7By6+exVBvBgazcrVRjQ5gAbZOg5GwdIxSLxY7ASXmcNcJbVpMsaObdqm9bSx5GrfSi94bAKp81EQWUDyZg6q8KdnYpzQulJv5oK6ayj/p+IbhzJ1/djX4kMcsyvv61EFNYwccIPaofOMH4cBpXNcmgfQo5r8vuuVR2zPKEJNcFCVINVW+Lj8q2CWXTzOyYIQ5mZu0JpadB4r+eFMh2S/fTXP//g7ql/FRrJ07DNyb2GDmLU2CLYUi/cTOpJUBcfJuClOl4DT7Mr5/JmVsBggD6In08sLKoYhTwjc5WBJnUDc3BbGsnXRi3EGWjoCFq7i2PxQy6aCbbg1KFciV6iu3MY/Tn5QWVqLXsE3EwzEgC257GuBiNX7+yB4p2QF3jGMSoQH+YKJw9FT5IHghqyzwCiSJxmquLZqGLVeGA0i2UR1OkYyczlC4L1SrJb24m8hgnj6BOnjspmRbzEbXXihJxMgEjlGETMeFrNx03KNOulyoJouJhHfoDQjKGSbw27hvQUF9lvWRCwRvQNuAoR5EkIooO2wNRlNAYXqJAOPi0v/mgTE8la6GCLzda1qd0b5Rfb2kQsgAL77A5dXrLkjR2QQByBg8cU67NKlg8irKehmrcKAmFXmMT2setn3PLGNjfWoayc0ZTdfZPdVhxgb4my8DgL9glG93ffNM4qPxA+K19UdYB3ycII+yia6xo5uQ0BUkd9fE7YkDY7MRhHXytplvKHV9Cn4/qrxen27N3shcgyPMRkM9ZjtBP4W6DuB5XNkg7kez4xgO9peQyKrKy8SzEys6CLKHdaqoTTL3fW+hd/6Qhg+scHgIaC8VDuarPriu19Lhg7HhE8zcHPJApSq2fVmFrPAgQtAWAhtvQlh1MkcQJqBUr91kzn+99s6b0hICk6YLEBs03LcsyW7TwORczWh0Z wqBSSW6+ pRP+BpMorIAiVXElbk/KLTcRsfUSDFYDkmPtbNNwwSvfqizlbCu7oxUxDOcVvZoBtW8LJOIAcWHVXA2k8D2WYkjEi0NHssDii4NUkzJUaf16umqpO3Y7t72BiEgWCLLlIxhjf8OEFAH63QJMUm3veinOoOVrheX5+5Y3hzXDR7aYbJge29Xnk11FBcRtpEmkW5s283YEjtabR3eabAvIylVoviToiGuGRtIwLz6QAt3T7YGccl4IKw6I2c2KYOKKJaC4bchrRrMXjUVJlneDEBBAeWWL1O1zzam5gEei1Rtnyp2micxXrCs+Iyt8ncHAq1I3axZJ1a6Ka2N2SBZcLRJxnfW3rzDm15cdfAm+MSzLl9Z/YGAnXJXz+UvKZ1+ceQ3vi7z5Ld56G2F7ImAwMzWmPP+icxyjoKn4SmxIujdEsnbdXKszRdi4FV2ip+Z2v8vY76ThlH4xkq7t1h9+gsXwqryeNm1EX6R0oHKVfQ814dgjlERja9QGr1j+jOR015qfh3Qyp3O5bCaOwdqgr+Doyb1U24mH0Op9vU7FYzR7smaMs1d7gwi5XHZO3lGP8y8btWUJeuxyLFKI= 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 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