export RK_PA3

hc

2024-02-19 151fecfb72a0d602dfe79790602ef64b4e241574

 kernel/fs/omfs/file.c
..
..
@@ -1,7 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * OMFS (as used by RIO Karma) file operations.
3
4
  * Copyright (C) 2005 Bob Copeland <me@bobcopeland.com>
4
- * Released under GPL v2.
5
5
  */
6
6
 
7
7
 #include <linux/module.h>
..
..
@@ -220,7 +220,7 @@
220
220
 	struct buffer_head *bh;
221
221
 	sector_t next, offset;
222
222
 	int ret;
223
-	u64 uninitialized_var(new_block);
223
+	u64 new_block;
224
224
 	u32 max_extents;
225
225
 	int extent_count;
226
226
 	struct omfs_extent *oe;
..
..
@@ -289,10 +289,9 @@
289
289
 	return block_read_full_page(page, omfs_get_block);
290
290
 }
291
291
 
292
-static int omfs_readpages(struct file *file, struct address_space *mapping,
293
-		struct list_head *pages, unsigned nr_pages)
292
+static void omfs_readahead(struct readahead_control *rac)
294
293
 {
295
-	return mpage_readpages(mapping, pages, nr_pages, omfs_get_block);
294
+	mpage_readahead(rac, omfs_get_block);
296
295
 }
297
296
 
298
297
 static int omfs_writepage(struct page *page, struct writeback_control *wbc)
..
..
@@ -373,7 +372,7 @@
373
372
 
374
373
 const struct address_space_operations omfs_aops = {
375
374
 	.readpage = omfs_readpage,
376
-	.readpages = omfs_readpages,
375
+	.readahead = omfs_readahead,
377
376
 	.writepage = omfs_writepage,
378
377
 	.writepages = omfs_writepages,
379
378
 	.write_begin = omfs_write_begin,