forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87 
 kernel/fs/ocfs2/aops.c
....@@ -1,22 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /* -*- mode: c; c-basic-offset: 8; -*-
23  * vim: noexpandtab sw=8 ts=8 sts=0:
34  *
45  * Copyright (C) 2002, 2004 Oracle.  All rights reserved.
5
- *
6
- * This program is free software; you can redistribute it and/or
7
- * modify it under the terms of the GNU General Public
8
- * License as published by the Free Software Foundation; either
9
- * version 2 of the License, or (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
- * General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public
17
- * License along with this program; if not, write to the
18
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19
- * Boston, MA 021110-1307, USA.
206  */
217 
228 #include <linux/fs.h>
....@@ -25,11 +11,11 @@
2511 #include <linux/pagemap.h>
2612 #include <asm/byteorder.h>
2713 #include <linux/swap.h>
28
-#include <linux/pipe_fs_i.h>
2914 #include <linux/mpage.h>
3015 #include <linux/quotaops.h>
3116 #include <linux/blkdev.h>
3217 #include <linux/uio.h>
18
+#include <linux/mm.h>
3319 
3420 #include <cluster/masklog.h>
3521 
....@@ -364,14 +350,11 @@
364350  * grow out to a tree. If need be, detecting boundary extents could
365351  * trivially be added in a future version of ocfs2_get_block().
366352  */
367
-static int ocfs2_readpages(struct file *filp, struct address_space *mapping,
368
-			   struct list_head *pages, unsigned nr_pages)
353
+static void ocfs2_readahead(struct readahead_control *rac)
369354 {
370
-	int ret, err = -EIO;
371
-	struct inode *inode = mapping->host;
355
+	int ret;
356
+	struct inode *inode = rac->mapping->host;
372357 	struct ocfs2_inode_info *oi = OCFS2_I(inode);
373
-	loff_t start;
374
-	struct page *last;
375358 
376359 	/*
377360 	 * Use the nonblocking flag for the dlm code to avoid page
....@@ -379,36 +362,31 @@
379362 	 */
380363 	ret = ocfs2_inode_lock_full(inode, NULL, 0, OCFS2_LOCK_NONBLOCK);
381364 	if (ret)
382
-		return err;
365
+		return;
383366 
384
-	if (down_read_trylock(&oi->ip_alloc_sem) == 0) {
385
-		ocfs2_inode_unlock(inode, 0);
386
-		return err;
387
-	}
367
+	if (down_read_trylock(&oi->ip_alloc_sem) == 0)
368
+		goto out_unlock;
388369 
389370 	/*
390371 	 * Don't bother with inline-data. There isn't anything
391372 	 * to read-ahead in that case anyway...
392373 	 */
393374 	if (oi->ip_dyn_features & OCFS2_INLINE_DATA_FL)
394
-		goto out_unlock;
375
+		goto out_up;
395376 
396377 	/*
397378 	 * Check whether a remote node truncated this file - we just
398379 	 * drop out in that case as it's not worth handling here.
399380 	 */
400
-	last = list_entry(pages->prev, struct page, lru);
401
-	start = (loff_t)last->index << PAGE_SHIFT;
402
-	if (start >= i_size_read(inode))
403
-		goto out_unlock;
381
+	if (readahead_pos(rac) >= i_size_read(inode))
382
+		goto out_up;
404383 
405
-	err = mpage_readpages(mapping, pages, nr_pages, ocfs2_get_block);
384
+	mpage_readahead(rac, ocfs2_get_block);
406385 
407
-out_unlock:
386
+out_up:
408387 	up_read(&oi->ip_alloc_sem);
388
+out_unlock:
409389 	ocfs2_inode_unlock(inode, 0);
410
-
411
-	return err;
412390 }
413391 
414392 /* Note: Because we don't support holes, our allocation has
....@@ -955,7 +933,8 @@
955933 
956934 		if (tmppage && page_has_buffers(tmppage)) {
957935 			if (ocfs2_should_order_data(inode))
958
-				ocfs2_jbd2_file_inode(wc->w_handle, inode);
936
+				ocfs2_jbd2_inode_add_write(wc->w_handle, inode,
937
+							   user_pos, user_len);
959938 
960939 			block_commit_write(tmppage, from, to);
961940 		}
....@@ -1392,8 +1371,7 @@
13921371 unlock:
13931372 	spin_unlock(&oi->ip_lock);
13941373 out:
1395
-	if (new)
1396
-		kfree(new);
1374
+	kfree(new);
13971375 	return ret;
13981376 }
13991377 
....@@ -2037,8 +2015,14 @@
20372015 		}
20382016 
20392017 		if (page_has_buffers(tmppage)) {
2040
-			if (handle && ocfs2_should_order_data(inode))
2041
-				ocfs2_jbd2_file_inode(handle, inode);
2018
+			if (handle && ocfs2_should_order_data(inode)) {
2019
+				loff_t start_byte =
2020
+					((loff_t)tmppage->index << PAGE_SHIFT) +
2021
+					from;
2022
+				loff_t length = to - from;
2023
+				ocfs2_jbd2_inode_add_write(handle, inode,
2024
+							   start_byte, length);
2025
+			}
20422026 			block_commit_write(tmppage, from, to);
20432027 		}
20442028 	}
....@@ -2473,7 +2457,7 @@
24732457 
24742458 const struct address_space_operations ocfs2_aops = {
24752459 	.readpage		= ocfs2_readpage,
2476
-	.readpages		= ocfs2_readpages,
2460
+	.readahead		= ocfs2_readahead,
24772461 	.writepage		= ocfs2_writepage,
24782462 	.write_begin		= ocfs2_write_begin,
24792463 	.write_end		= ocfs2_write_end,