From patchwork Fri Sep 4 09:13:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 11756349 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 269E6138E for ; Fri, 4 Sep 2020 09:15:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0245620722 for ; Fri, 4 Sep 2020 09:15:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ghLIk1Z6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729797AbgIDJPx (ORCPT ); Fri, 4 Sep 2020 05:15:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729712AbgIDJPw (ORCPT ); Fri, 4 Sep 2020 05:15:52 -0400 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19CD9C061244; Fri, 4 Sep 2020 02:15:51 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id i26so7596630ejb.12; Fri, 04 Sep 2020 02:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I2LMSq/YzffTbgrpx4Wic/tfmfolWAmyQMf47ukY+FY=; b=ghLIk1Z6cjUJpspIKGhD7yHPKofS+e1eO9MWem061ZYh2/nUK/8BHKrLzeI6KW2CUS KpzCrbcO23gCxP43hYhvn5irPvjju4XUMeow4aiswQjgEQMq+infzImEnEX4NBCthiFP FKcfA/6yaprqwQu6vqDrvWRwzTZj7gDiGn6Pfd5edWYPig58LrYJPz+MEMmYJyqVawUE 1ZT5qd8amYxAJtCQTNkDMO8QWzgDso8vKGErwhqmLMYxgM5zFRldq+JNhV3nEScB0nXk q/FuXrpeVkNa7X2ll1q3eSuwM7qrovSOLxeHXfaCGbBBLEIXeWAxMeJu8VXGzb9I7dwk e4kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=I2LMSq/YzffTbgrpx4Wic/tfmfolWAmyQMf47ukY+FY=; b=IHY6/Lfkixmiyir6kOYeBoPoCju4klqc08vXBWDu6sbNjnoSwsgb1v8elfE1LizZDb plVwfOMoe1zN2lViUnEejpUaY6aEkS6C0H62Swk1Y7bxnzONwZx7oxlMvO2WxrkIwmsu eGxeizAFsrxdMu4c5shkmDm1CF6KRia1jNgCHZUYVgsTs5/YD2eJK+TINDdmODmfVU3R bThRmLK3GJcftMXI7QFL3JHlRPlaJ3HBF+MliR3KCZMvUCJWoWbjEsKHXwAZVJiKL1w0 3MEIepnm/w9CzTCvuIlvIbMqyVtWeIhqdLn2az4dMvXR7r1Jaqr4eNdKQk4KRVN83JAe CbqQ== X-Gm-Message-State: AOAM530AG2JOcnb+aOevGIr70ciztREndqZoZBLbNezDobIYeuvJyksD Hni+6eeaU/HpM6cghbi3ahapA9xcXu0TKA== X-Google-Smtp-Source: ABdhPJzBzrwrJSW5I+yni8sT23GJnwVM1HBagGGj+rftz4cCEZ4N3Ui1gIyAPffrBSiRmPXIUTMNVw== X-Received: by 2002:a17:906:1ed4:: with SMTP id m20mr6531947ejj.460.1599210950551; Fri, 04 Sep 2020 02:15:50 -0700 (PDT) Received: from localhost.localdomain ([2a01:598:b904:9293:1d41:83f0:a723:a7e3]) by smtp.gmail.com with ESMTPSA id a26sm5562066ejk.66.2020.09.04.02.15.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 02:15:50 -0700 (PDT) From: Bean Huo To: axboe@kernel.dk, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: beanhuo@micron.com Subject: [PATCH 1/2] block: use generic_file_buffered_read() Date: Fri, 4 Sep 2020 11:13:40 +0200 Message-Id: <20200904091341.28756-2-huobean@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200904091341.28756-1-huobean@gmail.com> References: <20200904091341.28756-1-huobean@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Bean Huo do_generic_file_read() has been renamed to generic_file_buffered_read() since commit 47c27bc46946 ("fs: pass iocb to do_generic_file_read"). Signed-off-by: Bean Huo --- drivers/block/sunvdc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c index 39aeebc6837d..06262e990c9b 100644 --- a/drivers/block/sunvdc.c +++ b/drivers/block/sunvdc.c @@ -1017,9 +1017,9 @@ static int vdc_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) VDCBLK_NAME "%c", 'a' + ((int)vdev->dev_no % 26)); port->vdisk_size = -1; - /* Actual wall time may be double due to do_generic_file_read() doing - * a readahead I/O first, and once that fails it will try to read a - * single page. + /* Actual wall time may be double due to generic_file_buffered_read() + * doing a readahead I/O first, and once that fails it will try to read + * a single page. */ ldc_timeout = mdesc_get_property(hp, vdev->mp, "vdc-timeout", NULL); port->ldc_timeout = ldc_timeout ? *ldc_timeout : 0; From patchwork Fri Sep 4 09:13:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 11756351 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A028E138E for ; Fri, 4 Sep 2020 09:15:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 885AF2084D for ; Fri, 4 Sep 2020 09:15:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hmR8l2V5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729808AbgIDJP5 (ORCPT ); Fri, 4 Sep 2020 05:15:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729712AbgIDJPz (ORCPT ); Fri, 4 Sep 2020 05:15:55 -0400 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51E90C061245; Fri, 4 Sep 2020 02:15:53 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id e23so7667886eja.3; Fri, 04 Sep 2020 02:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NEfgg+DDlfqzQBPz0P9WGlQbszfNCAP2l3dg5MsL0gY=; b=hmR8l2V5bNd8O4XRQlSzk9uDugXK/lxgFMy+JdhRvO1gqMEVhszyFxx6EnYmMk3d5h 4+I6XnfO0Ob2mcxGn9CQwo4djzuQrdym/MbqyFTy6zkmklgleZKbU5dQwZrUDS6HpoRN pKffqzyWwCJst08Ccy4Rr9sTWtuSRaDEKHEi6t/k8DIHzEAhhGVw7j2wZ203Xm19wztF JL93vnmlEXb25gpMei4Y97DHJuYPdD0cYfm4dZRiA8jzYT4w4WaY167DdsITtQJGFLU2 Jl4uLjdwDLEqmPFy9mQW9wOEqFN2oJshFu0lCsYgidFR0/FxyCpLWM5HONpev4KRkmWo gnaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NEfgg+DDlfqzQBPz0P9WGlQbszfNCAP2l3dg5MsL0gY=; b=o8JhQwq2YVeTcFTP/SliMl8LDhsJZRiw8WELLx1h+69Y5rMyjonAzsqnKq/frTcaAH 0AKZkzlX+sJXYpJ3KadipQCCZfSr/GhRuUt6m/y7/QZh3/vWABdCNdWm+ppcvNQr0d6x s4sslPmHYCmpH40ESXe5MBlVkxpFYfUDL1zS8airfviB7DW5Is5l6hXyqiGmNhGo5gpW FX5MaXRp1Wq0DJ2yXFV37AFHCo3fwADz/8ERMjDbwtB8b8QVzqwFG9u9mIcJq5oErHKW 84cugFV81/HUBYj9l++djGNvGwwo4S2UjLkSj70nKTVsxCFWiIGFD7wrPM0HtQFoWceB z3MQ== X-Gm-Message-State: AOAM532RfUB8fZjx4cobGRiP8eSBHiGsZ6sxpTTiqMKn4aD9nZ6YrGdT mn2T28Uzz/hhK8hm9WtOUAY= X-Google-Smtp-Source: ABdhPJxNbfTXeoYhBNmNnvds82JLA57Ur4/SGZtBbf3nYwc8xdDvT3ICdMf4uVSlAJyTHywkhGFu3w== X-Received: by 2002:a17:906:af53:: with SMTP id ly19mr6159476ejb.503.1599210951891; Fri, 04 Sep 2020 02:15:51 -0700 (PDT) Received: from localhost.localdomain ([2a01:598:b904:9293:1d41:83f0:a723:a7e3]) by smtp.gmail.com with ESMTPSA id a26sm5562066ejk.66.2020.09.04.02.15.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 02:15:51 -0700 (PDT) From: Bean Huo To: axboe@kernel.dk, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: beanhuo@micron.com Subject: [PATCH 2/2] fs: isofs: use generic_file_buffered_read() Date: Fri, 4 Sep 2020 11:13:41 +0200 Message-Id: <20200904091341.28756-3-huobean@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200904091341.28756-1-huobean@gmail.com> References: <20200904091341.28756-1-huobean@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Bean Huo do_generic_file_read() has been renamed to generic_file_buffered_read() since commit 47c27bc46946 ("fs: pass iocb to do_generic_file_read"). Signed-off-by: Bean Huo --- fs/isofs/compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c index bc12ac7e2312..7541581c1064 100644 --- a/fs/isofs/compress.c +++ b/fs/isofs/compress.c @@ -312,7 +312,7 @@ static int zisofs_readpage(struct file *file, struct page *page) end_index = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT; /* * If this page is wholly outside i_size we just return zero; - * do_generic_file_read() will handle this for us + * generic_file_buffered_read() will handle this for us */ if (index >= end_index) { SetPageUptodate(page);