From 63b0b489699896eeb8d9c84ad9553a7f501017ce Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Sat, 18 Jun 2022 21:25:56 +0200
Subject: [PATCH] linux515: Update bcachefs patchset

---
 PKGBUILD                                        |  2 +-
 linux-tkg-patches/5.15/0008-5.15-bcachefs.patch | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 93a6ad4..cb3c460 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -626,7 +626,7 @@ case $_basever in
             'c8f7c50d9b1418ba22b5ca735c47111a162be416109714d26a674162e5b2cb97'
             '63a2ddf7ca9d3922f4eac3ac66bc37ffb10ad8b18b3e596832d3faa66b93dfa6'
             '00b452910c68fba6dcebbf6c064beff565b2c60ac07a9c1a3375b8bf0354911f'
-            '68659b54bd0c0539c22869feea8017faf947af6883d75c00089f2bfd9f265f8e'
+            '980be21d8b6a014752ea094fd996da3c8a25f5c38020e0d704b7f9d3181a5d9e'
             '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
             '978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc'
             '930996cdd9b63e3456cc49da4015631717c1c2ec41f879b25a9100e95e0b38fb'
diff --git a/linux-tkg-patches/5.15/0008-5.15-bcachefs.patch b/linux-tkg-patches/5.15/0008-5.15-bcachefs.patch
index f70f908..68cfa62 100644
--- a/linux-tkg-patches/5.15/0008-5.15-bcachefs.patch
+++ b/linux-tkg-patches/5.15/0008-5.15-bcachefs.patch
@@ -21,7 +21,7 @@ index a6fb6a0b4295..3c9cc0000168 100644
  
  /**
   * bio_truncate - truncate the bio to small size of @new_size
-@@ -1284,15 +1284,27 @@ EXPORT_SYMBOL(bio_advance);
+@@ -1284,17 +1284,28 @@ EXPORT_SYMBOL(bio_advance);
  void bio_copy_data_iter(struct bio *dst, struct bvec_iter *dst_iter,
  			struct bio *src, struct bvec_iter *src_iter)
  {
@@ -33,7 +33,8 @@ index a6fb6a0b4295..3c9cc0000168 100644
 -		struct bio_vec src_bv = bio_iter_iovec(src, *src_iter);
 -		struct bio_vec dst_bv = bio_iter_iovec(dst, *dst_iter);
 -		unsigned int bytes = min(src_bv.bv_len, dst_bv.bv_len);
--		void *src_buf;
+-		void *src_buf = bvec_kmap_local(&src_bv);
+-		void *dst_buf = bvec_kmap_local(&dst_bv);
 +		src_bv = bio_iter_iovec(src, *src_iter);
 +		dst_bv = bio_iter_iovec(dst, *dst_iter);
 +
@@ -48,12 +49,13 @@ index a6fb6a0b4295..3c9cc0000168 100644
 +
 +		kunmap_atomic(dst_p);
 +		kunmap_atomic(src_p);
- 
--		src_buf = bvec_kmap_local(&src_bv);
--		memcpy_to_bvec(&dst_bv, src_buf);
+
+-		memcpy(dst_buf, src_buf, bytes);
+
+-		kunmap_local(dst_buf);
 -		kunmap_local(src_buf);
 +		flush_dcache_page(dst_bv.bv_page);
- 
+
  		bio_advance_iter_single(src, src_iter, bytes);
  		bio_advance_iter_single(dst, dst_iter, bytes);
 @@ -1366,6 +1378,7 @@ void bio_set_pages_dirty(struct bio *bio)