From patchwork Fri Mar 23 16:47:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen-chien Jesse Sung X-Patchwork-Id: 890064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 4078bg4Vr2z9s0w; Sat, 24 Mar 2018 03:47:43 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ezPqt-0001U1-4l; Fri, 23 Mar 2018 16:47:39 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1ezPqq-0001TA-Qf for kernel-team@lists.ubuntu.com; Fri, 23 Mar 2018 16:47:36 +0000 Received: from 123-204-41-50.static.seed.net.tw ([123.204.41.50] helo=cola.voip.idv.tw) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1ezPqq-0001XI-1z; Fri, 23 Mar 2018 16:47:36 +0000 From: Wen-chien Jesse Sung To: kernel-team@lists.ubuntu.com Subject: [bionic][PATCH 03/10] UBUNTU: SAUCE: ubuntu/rtl8821c: use kernel_read() instead of __vfs_read() Date: Sat, 24 Mar 2018 00:47:00 +0800 Message-Id: <20180323164707.6027-4-jesse.sung@canonical.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180323164707.6027-1-jesse.sung@canonical.com> References: <20180323164707.6027-1-jesse.sung@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://launchpad.net/bugs/1740231 The __vfs_read() is not exported any more. Signed-off-by: Wen-chien Jesse Sung --- ubuntu/rtl8821c/os_dep/osdep_service.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ubuntu/rtl8821c/os_dep/osdep_service.c b/ubuntu/rtl8821c/os_dep/osdep_service.c index 02c70d9a0e11..500c26411a8a 100644 --- a/ubuntu/rtl8821c/os_dep/osdep_service.c +++ b/ubuntu/rtl8821c/os_dep/osdep_service.c @@ -2037,11 +2037,7 @@ static int readFile(struct file *fp, char *buf, int len) return -EPERM; while (sum < len) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) - rlen = __vfs_read(fp, buf + sum, len - sum, &fp->f_pos); -#else - rlen = fp->f_op->read(fp, buf + sum, len - sum, &fp->f_pos); -#endif + rlen = kernel_read(fp, buf + sum, len - sum, &fp->f_pos); if (rlen > 0) sum += rlen; else if (0 != rlen)