Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp227448ioo; Thu, 26 May 2022 02:12:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRehpYpLC6QoO1gL2WdYxUJjf4hKUBUVPCzPCGzI6z97Qc+3ucyG9vhF2eclHIB2ukjo4V X-Received: by 2002:a65:690a:0:b0:3f6:1815:f542 with SMTP id s10-20020a65690a000000b003f61815f542mr32594750pgq.275.1653556364408; Thu, 26 May 2022 02:12:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653556364; cv=none; d=google.com; s=arc-20160816; b=H68XDNHn6azIoBC5XbQu5BCyjuZOVdz4vSck8zdJ2GiB4BMzuSnkQI5/r5+GCnd0jl sV5dh3XOD6Bslu3h6FsMIZCEZxTJPOGvDNZ5AVc0adKiHSPtWfJSOXBOUDh6G1GgOCga bON7ELFUoaHYRXPulNdSBYjTHrFsdC0B0+RHe+jI/lmSSgbL7ausTKv9Uk5A7n+JlCtM qJvhst48P32m/bioQcsSVlzY7YAE9b1rIJzbJRv/bsHEKFXbWSVGbukmW7mC0uFJdffR zdu4u2/1F5Pax12tgHAIjtKCUygVkezhgWwBxXVA4aVuemNb4GW2dLdPYtDIJblA74/j /XLQ== 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 :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:organization:dkim-signature; bh=JPjH9LzUL2EEkZyPk4S7m1LZ52Vs/cmjg6eI3uOHDjw=; b=T4rbf99r/Min1vz9TXwUm3Ct7K3Wejq/MbvQd7SeVlAbVPCF6/dmWgQGWkUAf94I56 C8ytRD+oo1A0dYUgP6vw67g9belFZz3Vh7R+SoPUoZnpxg2OnAjiBl5CUNCSwwstK2Xi Ci6aL9bFWxr/iyOaWksNa1nKoz8B28tHgLWKP6bVHxwo31PfX2JKUh7anGe18CRj/SVg kAayn+NPxmAEvjjgEUWjr420/poXl39Eq9w6ox+YyfBNjGDDhRgXXiZwoxkRxhXr/i35 t43FrLjMdnTR9NCBApm6KgDR0de/qjivFIQ1xpndmqEKOZp2K7vYQdf57YZesXzqvyXw cIEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=e56LnJrf; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s26-20020a63525a000000b003f66d072d69si1788320pgl.452.2022.05.26.02.12.31; Thu, 26 May 2022 02:12:44 -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=e56LnJrf; 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 S244770AbiEYO1K (ORCPT + 99 others); Wed, 25 May 2022 10:27:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244834AbiEYO1B (ORCPT ); Wed, 25 May 2022 10:27:01 -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 ESMTP id 3D13410FF3 for ; Wed, 25 May 2022 07:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653488802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JPjH9LzUL2EEkZyPk4S7m1LZ52Vs/cmjg6eI3uOHDjw=; b=e56LnJrf/3/4/zM/olQMNUmOdyjFr7QGXvpuB3J8vB4+RRzNhoz+VJtivKwzuIhZwuaWU1 H+q30c6a6IJHsi3SWpHyufNGLUfANnAliJEMeSIqPs8eHsDKVxxAedoZk+JD8zJeVp+yQw e1NaV6xqFoY5YoeaXzBotYstW7WS58o= 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-312-ZpfTyUnoOV2hnKXzBcci_g-1; Wed, 25 May 2022 10:26:39 -0400 X-MC-Unique: ZpfTyUnoOV2hnKXzBcci_g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A72ED811E83; Wed, 25 May 2022 14:26:38 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E84F400F3E8; Wed, 25 May 2022 14:26:37 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 4/7] cifs: Add a function to read into an iter from a socket From: David Howells To: Steve French Cc: Steve French , Shyam Prasad N , Rohith Surabattula , linux-cifs@vger.kernel.org, dhowells@redhat.com, Shyam Prasad N , Rohith Surabattula , Jeff Layton , Al Viro , linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 25 May 2022 15:26:36 +0100 Message-ID: <165348879662.2106726.16881134187242702351.stgit@warthog.procyon.org.uk> In-Reply-To: <165348876794.2106726.9240233279581920208.stgit@warthog.procyon.org.uk> References: <165348876794.2106726.9240233279581920208.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.4 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham 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 Add a helper function to read data from a socket into the given iterator. Signed-off-by: David Howells cc: Steve French cc: Shyam Prasad N cc: Rohith Surabattula cc: linux-cifs@vger.kernel.org --- fs/cifs/cifsproto.h | 3 +++ fs/cifs/connect.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 0df3b24a0bf4..dd4931308ea6 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -245,6 +245,9 @@ extern int cifs_read_page_from_socket(struct TCP_Server_Info *server, unsigned int page_offset, unsigned int to_read); extern int cifs_setup_cifs_sb(struct cifs_sb_info *cifs_sb); +extern int cifs_read_iter_from_socket(struct TCP_Server_Info *server, + struct iov_iter *iter, + unsigned int to_read); extern int cifs_match_super(struct super_block *, void *); extern int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx); extern void cifs_umount(struct cifs_sb_info *); diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 42e14f408856..0d532d559f70 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -764,6 +764,22 @@ cifs_read_page_from_socket(struct TCP_Server_Info *server, struct page *page, return cifs_readv_from_socket(server, &smb_msg); } +int +cifs_read_iter_from_socket(struct TCP_Server_Info *server, struct iov_iter *iter, + unsigned int to_read) +{ + struct msghdr smb_msg; + int ret; + + smb_msg.msg_iter = *iter; + if (smb_msg.msg_iter.count > to_read) + smb_msg.msg_iter.count = to_read; + ret = cifs_readv_from_socket(server, &smb_msg); + if (ret > 0) + iov_iter_advance(iter, ret); + return ret; +} + static bool is_smb_response(struct TCP_Server_Info *server, unsigned char type) {