From: Greg Kroah-Hartman Date: Wed, 2 Oct 2024 06:25:03 +0000 (+0200) Subject: drop bcachefs patches X-Git-Tag: v6.6.54~43 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbbd03b4e75e546af52e62c229325d423e8ea11a;p=thirdparty%2Fkernel%2Fstable-queue.git drop bcachefs patches --- diff --git a/queue-6.10/bcachefs-fix-negative-timespecs.patch b/queue-6.10/bcachefs-fix-negative-timespecs.patch deleted file mode 100644 index 0b5f2699944..00000000000 --- a/queue-6.10/bcachefs-fix-negative-timespecs.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a3ed1cc4136df01e74a8b6df8c562db69e752bad Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Sat, 7 Sep 2024 18:00:26 +0200 -Subject: bcachefs: Fix negative timespecs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Alyssa Ross - -commit a3ed1cc4136df01e74a8b6df8c562db69e752bad upstream. - -This fixes two problems in the handling of negative times: - - • rem is signed, but the rem * c->sb.nsec_per_time_unit operation - produced a bogus unsigned result, because s32 * u32 = u32. - - • The timespec was not normalized (it could contain more than a - billion nanoseconds). - -For example, { .tv_sec = -14245441, .tv_nsec = 750000000 }, after -being round tripped through timespec_to_bch2_time and then -bch2_time_to_timespec would come back as -{ .tv_sec = -14245440, .tv_nsec = 4044967296 } (more than 4 billion -nanoseconds). - -Cc: stable@vger.kernel.org -Fixes: 595c1e9bab7f ("bcachefs: Fix time handling") -Closes: https://github.com/koverstreet/bcachefs/issues/743 -Co-developed-by: Erin Shepherd -Signed-off-by: Erin Shepherd -Co-developed-by: Ryan Lahfa -Signed-off-by: Ryan Lahfa -Signed-off-by: Alyssa Ross -Signed-off-by: Kent Overstreet -Signed-off-by: Greg Kroah-Hartman ---- - fs/bcachefs/bcachefs.h | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/fs/bcachefs/bcachefs.h -+++ b/fs/bcachefs/bcachefs.h -@@ -1197,12 +1197,15 @@ static inline bool btree_id_cached(const - static inline struct timespec64 bch2_time_to_timespec(const struct bch_fs *c, s64 time) - { - struct timespec64 t; -+ s64 sec; - s32 rem; - - time += c->sb.time_base_lo; - -- t.tv_sec = div_s64_rem(time, c->sb.time_units_per_sec, &rem); -- t.tv_nsec = rem * c->sb.nsec_per_time_unit; -+ sec = div_s64_rem(time, c->sb.time_units_per_sec, &rem); -+ -+ set_normalized_timespec64(&t, sec, rem * (s64)c->sb.nsec_per_time_unit); -+ - return t; - } - diff --git a/queue-6.10/series b/queue-6.10/series index d083557f860..d7da4a6a9ce 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -583,7 +583,6 @@ vfs-fix-race-between-evice_inodes-and-find_inode-iput.patch netfs-delete-subtree-of-fs-netfs-when-netfs-module-exits.patch fs-fix-file_set_fowner-lsm-hook-inconsistencies.patch nfs-fix-memory-leak-in-error-path-of-nfs4_do_reclaim.patch -bcachefs-fix-negative-timespecs.patch edac-igen6-fix-conversion-of-system-address-to-physical-memory-address.patch icmp-change-the-order-of-rate-limits.patch eventpoll-annotate-data-race-of-busy_poll_usecs.patch diff --git a/queue-6.11/bcachefs-fix-negative-timespecs.patch b/queue-6.11/bcachefs-fix-negative-timespecs.patch deleted file mode 100644 index ab413e905da..00000000000 --- a/queue-6.11/bcachefs-fix-negative-timespecs.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a3ed1cc4136df01e74a8b6df8c562db69e752bad Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Sat, 7 Sep 2024 18:00:26 +0200 -Subject: bcachefs: Fix negative timespecs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Alyssa Ross - -commit a3ed1cc4136df01e74a8b6df8c562db69e752bad upstream. - -This fixes two problems in the handling of negative times: - - • rem is signed, but the rem * c->sb.nsec_per_time_unit operation - produced a bogus unsigned result, because s32 * u32 = u32. - - • The timespec was not normalized (it could contain more than a - billion nanoseconds). - -For example, { .tv_sec = -14245441, .tv_nsec = 750000000 }, after -being round tripped through timespec_to_bch2_time and then -bch2_time_to_timespec would come back as -{ .tv_sec = -14245440, .tv_nsec = 4044967296 } (more than 4 billion -nanoseconds). - -Cc: stable@vger.kernel.org -Fixes: 595c1e9bab7f ("bcachefs: Fix time handling") -Closes: https://github.com/koverstreet/bcachefs/issues/743 -Co-developed-by: Erin Shepherd -Signed-off-by: Erin Shepherd -Co-developed-by: Ryan Lahfa -Signed-off-by: Ryan Lahfa -Signed-off-by: Alyssa Ross -Signed-off-by: Kent Overstreet -Signed-off-by: Greg Kroah-Hartman ---- - fs/bcachefs/bcachefs.h | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/fs/bcachefs/bcachefs.h -+++ b/fs/bcachefs/bcachefs.h -@@ -1195,12 +1195,15 @@ static inline bool btree_id_cached(const - static inline struct timespec64 bch2_time_to_timespec(const struct bch_fs *c, s64 time) - { - struct timespec64 t; -+ s64 sec; - s32 rem; - - time += c->sb.time_base_lo; - -- t.tv_sec = div_s64_rem(time, c->sb.time_units_per_sec, &rem); -- t.tv_nsec = rem * c->sb.nsec_per_time_unit; -+ sec = div_s64_rem(time, c->sb.time_units_per_sec, &rem); -+ -+ set_normalized_timespec64(&t, sec, rem * (s64)c->sb.nsec_per_time_unit); -+ - return t; - } - diff --git a/queue-6.11/series b/queue-6.11/series index 0126d44fa0b..f61944aaa69 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -658,7 +658,6 @@ vfs-fix-race-between-evice_inodes-and-find_inode-iput.patch netfs-delete-subtree-of-fs-netfs-when-netfs-module-exits.patch fs-fix-file_set_fowner-lsm-hook-inconsistencies.patch nfs-fix-memory-leak-in-error-path-of-nfs4_do_reclaim.patch -bcachefs-fix-negative-timespecs.patch edac-igen6-fix-conversion-of-system-address-to-physical-memory-address.patch icmp-change-the-order-of-rate-limits.patch eventpoll-annotate-data-race-of-busy_poll_usecs.patch