From: Bean Huo <[email protected]>
v1--v2:
correct inaccurate patch title and commit message
Bean Huo (2):
block: fix incorrect comment in vdc_port_probe()
fs: isofs: fix incorrect comment in zisofs_readpage()
drivers/block/sunvdc.c | 6 +++---
fs/isofs/compress.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
--
2.17.1
From: Bean Huo <[email protected]>
do_generic_file_read() has been renamed to eneric_file_buffered_read()
since commit 47c27bc46946 ("fs: pass iocb to do_generic_file_read"), so
relpace it with generic_file_buffered_read() in the comment.
Signed-off-by: Bean Huo <[email protected]>
---
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);
--
2.17.1
From: Bean Huo <[email protected]>
do_generic_file_read() has been renamed to eneric_file_buffered_read()
since commit 47c27bc46946 ("fs: pass iocb to do_generic_file_read"), so
relpace it with generic_file_buffered_read() in the comment.
Signed-off-by: Bean Huo <[email protected]>
---
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;
--
2.17.1