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: 77866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp691903vqo; Fri, 31 Mar 2023 09:35:45 -0700 (PDT) X-Google-Smtp-Source: AKy350bE5L5eim0K1pdU3LPy2DiDZtO44tz3BJ51JSsh2eGM5P5NR5OPt2Dk78gi3Q/bsO8KJzcH X-Received: by 2002:a17:906:3149:b0:8ab:b03d:a34f with SMTP id e9-20020a170906314900b008abb03da34fmr9696136eje.12.1680280545441; Fri, 31 Mar 2023 09:35:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680280545; cv=none; d=google.com; s=arc-20160816; b=j2DjYM4WpBK3g29zEtyi4+aa7hJow3ScgAF1w7JwZFX+ZGUzQfjA+Y4bJvcC/v5ReZ Wru1CTLU7wH90MRJJDjT8x8hKqo/Et2WV3LjKXOLLBfznrCqTRV9zlF1zwE8OFwEJdQm DvEulu8wtSmOvzoWrMNHzALPvtKHqYC29YrmjvNAluK4kG45inYeMDJcUXXQjYcwhA8T FFywSOeI4DBEFigtTGlKACMnbmUyqFMeVX5gEQIUekjn8keFo82mX0sWHmTTSzbmO6bm rd0UGvLf89zq3bD8+3vcH1XkctIpnXS7q0mhBKCbTqKXYS24LBvFQlBqunkWMsVkLAaK JbEQ== 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=s7FY6IkB7NRnaaunO8kQ3wM8dgoy+C5dVBJnz6ApgXk=; b=zrZzjb5VREyqWn02b0cL+mgShhsCi4r35S/utyixAID4nFjwHnnohRyBeNeBg+v5Na Wj0BLNb+ukaMjWH9Ot7fBJHxO6gvffaYt1ykn6WKf++c+NpS5FwwmVsGUnNnYakpHize 33rYN6r2Q3ts6KpGFki7kZvpardnjAeGEU0SmhjdgPRClJqsjSur/W/G/db8e35CeZJz qS3XI3moP7sSrXyYDPynILAwMyu7fCyai/mzVtKXMc2qQjuh9cgL6cfswZdT8r1gmDic q+jlPXA+cGHx/LMNTr7ke2KuldWO+h9Pi0kTgJDeG39jmmYWctds/DPC2+HbIlOIyrgs FZBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BmHl6c3y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x20-20020aa7d394000000b004d49f845574si2385163edq.223.2023.03.31.09.35.21; Fri, 31 Mar 2023 09:35:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BmHl6c3y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232792AbjCaQKk (ORCPT + 99 others); Fri, 31 Mar 2023 12:10:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232267AbjCaQKW (ORCPT ); Fri, 31 Mar 2023 12:10:22 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 878C920C3E for ; Fri, 31 Mar 2023 09:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680278971; 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=BmHl6c3yHz2nqdMfBY4tlSLuwP9JAUQzzXaAVgfezYAWe7RG3UNG717rcDynLaltMcTi+o 9ad9mokSWfMeL3PUDtwW6ii4cAFpdQ2ziMV1QstPl7FjuEnAQZlA3+K3OsJZM8JR8Cm0RO UpY8y9+A8+bEFdBrKm8kjhgj5uuag3g= 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-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761901853300283447?= X-GMAIL-MSGID: =?utf-8?q?1761901853300283447?= 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;