From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 20 Jul 2023 19:05:11 +0000 (+0200)
Subject: fix up queue-5.10/f2fs-fix-to-avoid-null-pointer-dereference-f2fs_write_end_io.patch
X-Git-Tag: v5.15.121~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e34fff3bdce77254eb4fc1f822d9b3e13e6caa5;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up queue-5.10/f2fs-fix-to-avoid-null-pointer-dereference-f2fs_write_end_io.patch
---

diff --git a/queue-5.10/f2fs-fix-to-avoid-null-pointer-dereference-f2fs_write_end_io.patch b/queue-5.10/f2fs-fix-to-avoid-null-pointer-dereference-f2fs_write_end_io.patch
index d481a521d83..65a73ce58fe 100644
--- a/queue-5.10/f2fs-fix-to-avoid-null-pointer-dereference-f2fs_write_end_io.patch
+++ b/queue-5.10/f2fs-fix-to-avoid-null-pointer-dereference-f2fs_write_end_io.patch
@@ -73,8 +73,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  fs/f2fs/f2fs.h |    2 +-
  fs/f2fs/file.c |    2 +-
- fs/f2fs/gc.c   |   21 ++++++++++++++++++---
- 3 files changed, 20 insertions(+), 5 deletions(-)
+ fs/f2fs/gc.c   |   22 +++++++++++++++++++---
+ 3 files changed, 21 insertions(+), 5 deletions(-)
 
 --- a/fs/f2fs/f2fs.h
 +++ b/fs/f2fs/f2fs.h
@@ -100,7 +100,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int f2fs_ioc_enable_verity(struct file *filp, unsigned long arg)
 --- a/fs/f2fs/gc.c
 +++ b/fs/f2fs/gc.c
-@@ -1976,8 +1976,9 @@ static void update_fs_metadata(struct f2
+@@ -7,6 +7,7 @@
+  */
+ #include <linux/fs.h>
+ #include <linux/module.h>
++#include <linux/mount.h>
+ #include <linux/backing-dev.h>
+ #include <linux/init.h>
+ #include <linux/f2fs_fs.h>
+@@ -1976,8 +1977,9 @@ static void update_fs_metadata(struct f2
  	}
  }
  
@@ -111,7 +119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	__u64 old_block_count, shrunk_blocks;
  	struct cp_control cpc = { CP_RESIZE, 0, 0, 0 };
  	unsigned int secs;
-@@ -2015,12 +2016,18 @@ int f2fs_resize_fs(struct f2fs_sb_info *
+@@ -2015,12 +2017,18 @@ int f2fs_resize_fs(struct f2fs_sb_info *
  		return -EINVAL;
  	}
  
@@ -132,7 +140,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  	/* stop CP to protect MAIN_SEC in free_segment_range */
  	f2fs_lock_op(sbi);
-@@ -2040,10 +2047,18 @@ int f2fs_resize_fs(struct f2fs_sb_info *
+@@ -2040,10 +2048,18 @@ int f2fs_resize_fs(struct f2fs_sb_info *
  out_unlock:
  	f2fs_unlock_op(sbi);
  	up_write(&sbi->gc_lock);