From patchwork Fri Mar 31 16:08:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13196163 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 4DE76C76196 for ; Fri, 31 Mar 2023 16:09:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E06CE6B0075; Fri, 31 Mar 2023 12:09:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DB6476B0078; Fri, 31 Mar 2023 12:09:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0A266B007B; Fri, 31 Mar 2023 12:09:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id AFD306B0075 for ; Fri, 31 Mar 2023 12:09:37 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5E7C38120D for ; Fri, 31 Mar 2023 16:09:37 +0000 (UTC) X-FDA: 80629678794.11.3CD97E3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 90F4220020 for ; Fri, 31 Mar 2023 16:09:34 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BNYsksqP; spf=pass (imf03.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680278974; a=rsa-sha256; cv=none; b=2KoPCZDGbwPGrYb40/mPIEFvIWr9Is0qj2FN9XGED9pJXLMtOHDFTEATBXFFGPn6BHhI46 df++NJRLYD7JAawG5QFc4HTWHOAuiqTEufhEEoByNvn+wcFZCmmiu0vKA17+70GRwt6X92 yyr4ZL2pWQumUVq8cihJR+qwN0IiiqM= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BNYsksqP; spf=pass (imf03.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1680278974; 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=s7FY6IkB7NRnaaunO8kQ3wM8dgoy+C5dVBJnz6ApgXk=; b=yN7oz5Gg+6I+Bzh2Z/qH/qciFMkiuSCZ6uS/oA3ocHIqmvDxTzUSpx0cQB59H3dyNta/RD 2g5Erozo+/vtrnqUffTaUUwEl2mdwuXUO+hlYBNGQLn6DYHMCGo/ZZXh5ry84gjKaFbgun 4qqsA2VliP0P05SgQsdhcH0rsKxa3mU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680278973; 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=s7FY6IkB7NRnaaunO8kQ3wM8dgoy+C5dVBJnz6ApgXk=; b=BNYsksqPYHOKOBr9tACXj7sXpTRoW2E1wSnLIihEQj8k9YY3wDHp2D5ah0BYwmEF0QoBd/ u3TgzE8PXNnRjykIQNpXBCPaKCpPUbjPqVEl7GbTVcPMQe0YLX7V1ieFUqnHol2RMzY4mW S5DhV2Qu8CIv7NjRu0bQUF/33JReNb4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-364-gA1T6ksvPKuG1wGWcmZ53Q-1; Fri, 31 Mar 2023 12:09:28 -0400 X-MC-Unique: gA1T6ksvPKuG1wGWcmZ53Q-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12E9D1C05159; Fri, 31 Mar 2023 16:09:27 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15A39140E94F; Fri, 31 Mar 2023 16:09:24 +0000 (UTC) From: David Howells To: Matthew Wilcox , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Howells , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org Subject: [PATCH v3 02/55] iov_iter: Remove last_offset member Date: Fri, 31 Mar 2023 17:08:21 +0100 Message-Id: <20230331160914.1608208-3-dhowells@redhat.com> In-Reply-To: <20230331160914.1608208-1-dhowells@redhat.com> References: <20230331160914.1608208-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Rspam-User: X-Rspamd-Queue-Id: 90F4220020 X-Rspamd-Server: rspam01 X-Stat-Signature: afnskztirgop97yxcpbxh7j67ksnchxm X-HE-Tag: 1680278974-559861 X-HE-Meta: U2FsdGVkX18Co9ZB8hSS8rE9+MCCOflwd7a5gXAdJPRHCv9ukolwjOsBkeIkjjore8AabYTgGeQhB2xXNEElLEwB72i0cQ5YmywQJWJd5wouq/f50TM5oqpCca3xlmf/hau5lIMwg+Hm5hvaAiYjKmQErnZcYtJEhqQ0xG2A0Sxj55GlVh0v+5MGMhX901xTamFU5SwDUBYYRMAkfatmrSLP+usN7HZWb2eR+AAxwzNQ5HNNNT6Q+O+0nawdOIbfpQNAfNFiuYL1CGmwhpnhbNQYPJQphJBk799ymG4/pNt4COzMS+wtiR0HO2JfFMtiJMGD7hfCojb4LnbJAkofhRXUBjbmgABUHzVQ0PNu4kT+cQm7M7X2Ykcz8/bOrUsQLHk8JI9/mGefcIpwvxldZtTmes3uNj5qEqwF5uGeEoDi9mo6hy84IojdvfFIwDV8hoPnSy+FlEwv4NstcAcMXCi4bRfqNtcQVfpl/noClJPtvgPj6EMZoLQ1VVdGetFJIgCkHUGKgmxFD5fdYF43TC+WQAmitKco6AUBPl+7TCBQNumIqByjmC2oHgDmQSWoZVOX5rJrc5d70T6P8RV/A186vIalgufokfXjezFiJlIWbLo5vZIxiKcRchHErAlFUaZDOnpc55Bm1TgpS4wHgwoUNzBLYyymwLG8xdUEiAwDvB2rjRi3WBh66hY6i3ckJAxqBJOexnjd1UxkZwCb6SBgqc9KLoQkZC8gmWXdebGFY1ZTFpxEs0fUNCzuqVIL1JpBCP/aQbYvvN6JAPib0ro880cu0EwfgEIAlFxRRI4KFsSOW0Uepw78xqy+rxUVE+o6KhR3KxGaCWOi1sLNbv9/hk+eES5t3uA8lBfgo/WXlbSUxMgcna7FIdk1XtJ0HqS3UdjQ/pBXMJG80vqRU+mKmrTexkQVLEHcfm9onoOsEaKurKL3N50zxxjbD2QzDunwZmpjjy48f6t1PaT uSAds0UT KyJfxQ98YXBqPpOo8ogh5aql2UY49c3EFecj/IWccbmCFshUzOVo4KnQDWc9v0dUfrfXAJu1H0HHDiZCVsFQPm5gfUnYNz6nl2RYd7APPnDQY7bB4ny85jM3I3I7T+w8W945qmk99FpAUWJX3Schazhel6NrxEuTsoiSaNBBadNXRgr0jPJvb3m8Uc7P2rQ6qpcxg/4lOLgJTTcgw+g9oj05ncsChLB+ziKh/m9xi6t/BZbxLqph/X2rclfjoUzVqLgF6u4C/HNw+iQFG76MrqotfFLXZr+Po0jq+0+mk0K/RTZqVMIBx/1ApWAGgqchKSFDRUocUg51qwXxp0xu9aEsMhL9MXJxew3X3RzRmtznVpd0Wea+1vhX5k5p4+rKV/J4r6bLyR+DHUkyP2fSzbfxZEqBqP9/nANG4cZNCGRPNjxnHgR3OSN/3u1y6C3i8yL/G9QySOqwNZEbGctVwvDiQ9zshtv5a7G/L 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: With the removal of ITER_PIPE, the last_offset member of struct iov_iter is no longer used, so remove it and un-unionise the remaining member. Signed-off-by: David Howells cc: Jens Axboe cc: Matthew Wilcox cc: Alexander Viro cc: Jeff Layton cc: linux-nfs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org cc: netdev@vger.kernel.org Reviewed-by: Jeff Layton --- include/linux/uio.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/linux/uio.h b/include/linux/uio.h index 74598426edb4..2d8a70cb9b26 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -43,10 +43,7 @@ struct iov_iter { bool nofault; bool data_source; bool user_backed; - union { - size_t iov_offset; - int last_offset; - }; + size_t iov_offset; size_t count; union { const struct iovec *iov;