Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp1406259pxu; Mon, 23 Nov 2020 22:10:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJzHnqaKQguvCC+RpLLtrL6cIM9naZiFL0NvDnru5Nk0ZrRM7wljspwA+mblUG6GuDzNoM++ X-Received: by 2002:a50:a45c:: with SMTP id v28mr2442140edb.329.1606198258700; Mon, 23 Nov 2020 22:10:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606198258; cv=none; d=google.com; s=arc-20160816; b=nJmXr/qBDJvWf8HWLwVq/L3k9FeQ+eIDmSq9rF4+MUbP+uNXKMUVjlEejtFktmd4oj 3QM0yiuh+HKZFxpKNWip+T29keSWd4BdYRzJJRkinNYe6dDtpT+9/02UYfYNGMPU3nSk N77fKMqAKFEhBjgwFjy6p62a5Z4wxov8aE/Vz5Hy2T/7W8N+bNBDxINOjZovhabnsFxz OkfBtZOPUe8pAmv+UEDDCH4GSFLwjbDxBk0PoN1fptMClfGqcgABsavXKeMVIkgklr2Q i0srILqRgpP1GNuR6QQXmsH+1zl7hGP62zeD0W7lMLXgJNQS9kVlzg5RD/ynrH4hNAdy OOdQ== 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 :ironport-sdr:ironport-sdr; bh=uWAOisgbKoM3I0zNz5QHMbIHPnmeE+O3qfiuZC0MYbY=; b=WhGQE5s19HUIQvS9y+c7AvMivoy3RO0z1c2ywyyWnO2ZeWI3lKdueG7SRo11guNFQB doMkej8x6+bZhiWcygGzvV1OpUJYLT1NUIF6Tk1wkU99C3Y0HL9XZ7vOHwJc6vx5FRRg c+8ip3DwNIgy+x/Nf15KRsWLAd20I3Z0VDfVjK9x0x3ahUTwdRIFcujAvJNmpVKMgioG QLpxrt7zk0d2adqq25f/RcfOoU5dg7eMR6+gZxWmE8K0x7ZYmybB7KuQaZQnab0p4U68 DvpKalQbbsNpCHOQcsapaiOkVmqgSJ8bsN9eqD6drM5qasxvI5rd6du8dLtG+Q/hUqS7 47XA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j14si7923586ejx.329.2020.11.23.22.10.35; Mon, 23 Nov 2020 22:10:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729384AbgKXGII (ORCPT + 99 others); Tue, 24 Nov 2020 01:08:08 -0500 Received: from mga05.intel.com ([192.55.52.43]:21151 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729352AbgKXGIH (ORCPT ); Tue, 24 Nov 2020 01:08:07 -0500 IronPort-SDR: 1XP7hxXnnyO7UCUFwtMMPwR4D4a4D8wXwdbK97TWPfcOZxZgRHfmIO3zzIFXSuxcQUsXquk4HI I7AnDsF6OI/g== X-IronPort-AV: E=McAfee;i="6000,8403,9814"; a="256605346" X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="256605346" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2020 22:08:06 -0800 IronPort-SDR: mXooYBLIB0fnow1eFoG+61b71uCezpuGZMLYWik/u9TI+UyKJ1Kj8ogGFLjt4ha87h0bKNOxA9 5fNxBcqn6O7g== X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="370307585" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2020 22:08:06 -0800 From: ira.weiny@intel.com To: Andrew Morton Cc: Ira Weiny , Steve French , Thomas Gleixner , Dave Hansen , Matthew Wilcox , Christoph Hellwig , Dan Williams , Al Viro , Eric Biggers , Luis Chamberlain , Patrik Jakobsson , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Howells , Chris Mason , Josef Bacik , David Sterba , Jaegeuk Kim , Chao Yu , Nicolas Pitre , "Martin K. Petersen" , Brian King , Greg Kroah-Hartman , Alexei Starovoitov , Daniel Borkmann , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Kirti Wankhede , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 07/17] fs/cifs: Convert to memcpy_page() Date: Mon, 23 Nov 2020 22:07:45 -0800 Message-Id: <20201124060755.1405602-8-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 In-Reply-To: <20201124060755.1405602-1-ira.weiny@intel.com> References: <20201124060755.1405602-1-ira.weiny@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ira Weiny Use memcpy_page() instead of open coding kmap/memcpy/kunmap. Cc: Steve French Signed-off-by: Ira Weiny --- fs/cifs/smb2ops.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 504766cb6c19..d1088ee9a0e6 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -4223,17 +4223,13 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst, /* copy pages form the old */ for (j = 0; j < npages; j++) { - char *dst, *src; unsigned int offset, len; rqst_page_get_length(&new_rq[i], j, &len, &offset); - dst = (char *) kmap(new_rq[i].rq_pages[j]) + offset; - src = (char *) kmap(old_rq[i - 1].rq_pages[j]) + offset; - - memcpy(dst, src, len); - kunmap(new_rq[i].rq_pages[j]); - kunmap(old_rq[i - 1].rq_pages[j]); + memcpy_page(new_rq[i].rq_pages[j], offset, + old_rq[i - 1].rq_pages[j], offset, + len); } } -- 2.28.0.rc0.12.gb6a658bd00c9