From: Greg Kroah-Hartman Date: Mon, 19 Aug 2024 10:55:12 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v6.1.107~124 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb92171c9de37c179be60f17d0b0afa009de9820;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: btrfs-rename-bitmap_set_bits-btrfs_bitmap_set_bits.patch s390-cio-rename-bitmap_size-idset_bitmap_size.patch --- diff --git a/queue-4.19/btrfs-rename-bitmap_set_bits-btrfs_bitmap_set_bits.patch b/queue-4.19/btrfs-rename-bitmap_set_bits-btrfs_bitmap_set_bits.patch new file mode 100644 index 00000000000..3d5559347fc --- /dev/null +++ b/queue-4.19/btrfs-rename-bitmap_set_bits-btrfs_bitmap_set_bits.patch @@ -0,0 +1,48 @@ +From 4ca532d64648d4776d15512caed3efea05ca7195 Mon Sep 17 00:00:00 2001 +From: Alexander Lobakin +Date: Wed, 27 Mar 2024 16:23:47 +0100 +Subject: btrfs: rename bitmap_set_bits() -> btrfs_bitmap_set_bits() + +From: Alexander Lobakin + +commit 4ca532d64648d4776d15512caed3efea05ca7195 upstream. + +bitmap_set_bits() does not start with the FS' prefix and may collide +with a new generic helper one day. It operates with the FS-specific +types, so there's no change those two could do the same thing. +Just add the prefix to exclude such possible conflict. + +Reviewed-by: Przemek Kitszel +Acked-by: David Sterba +Reviewed-by: Yury Norov +Signed-off-by: Alexander Lobakin +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/free-space-cache.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/fs/btrfs/free-space-cache.c ++++ b/fs/btrfs/free-space-cache.c +@@ -1732,9 +1732,9 @@ static void bitmap_clear_bits(struct btr + ctl->free_space -= bytes; + } + +-static void bitmap_set_bits(struct btrfs_free_space_ctl *ctl, +- struct btrfs_free_space *info, u64 offset, +- u64 bytes) ++static void btrfs_bitmap_set_bits(struct btrfs_free_space_ctl *ctl, ++ struct btrfs_free_space *info, u64 offset, ++ u64 bytes) + { + unsigned long start, count; + +@@ -1991,7 +1991,7 @@ static u64 add_bytes_to_bitmap(struct bt + + bytes_to_set = min(end - offset, bytes); + +- bitmap_set_bits(ctl, info, offset, bytes_to_set); ++ btrfs_bitmap_set_bits(ctl, info, offset, bytes_to_set); + + /* + * We set some bytes, we have no idea what the max extent size is diff --git a/queue-4.19/s390-cio-rename-bitmap_size-idset_bitmap_size.patch b/queue-4.19/s390-cio-rename-bitmap_size-idset_bitmap_size.patch new file mode 100644 index 00000000000..3cb6fec8af6 --- /dev/null +++ b/queue-4.19/s390-cio-rename-bitmap_size-idset_bitmap_size.patch @@ -0,0 +1,61 @@ +From c1023f5634b9bfcbfff0dc200245309e3cde9b54 Mon Sep 17 00:00:00 2001 +From: Alexander Lobakin +Date: Wed, 27 Mar 2024 16:23:45 +0100 +Subject: s390/cio: rename bitmap_size() -> idset_bitmap_size() + +From: Alexander Lobakin + +commit c1023f5634b9bfcbfff0dc200245309e3cde9b54 upstream. + +bitmap_size() is a pretty generic name and one may want to use it for +a generic bitmap API function. At the same time, its logic is not +"generic", i.e. it's not just `nbits -> size of bitmap in bytes` +converter as it would be expected from its name. +Add the prefix 'idset_' used throughout the file where the function +resides. + +Reviewed-by: Przemek Kitszel +Acked-by: Peter Oberparleiter +Signed-off-by: Alexander Lobakin +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/s390/cio/idset.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/s390/cio/idset.c ++++ b/drivers/s390/cio/idset.c +@@ -16,7 +16,7 @@ struct idset { + unsigned long bitmap[0]; + }; + +-static inline unsigned long bitmap_size(int num_ssid, int num_id) ++static inline unsigned long idset_bitmap_size(int num_ssid, int num_id) + { + return bitmap_size(size_mul(num_ssid, num_id)); + } +@@ -25,11 +25,12 @@ static struct idset *idset_new(int num_s + { + struct idset *set; + +- set = vmalloc(sizeof(struct idset) + bitmap_size(num_ssid, num_id)); ++ set = vmalloc(sizeof(struct idset) + ++ idset_bitmap_size(num_ssid, num_id)); + if (set) { + set->num_ssid = num_ssid; + set->num_id = num_id; +- memset(set->bitmap, 0, bitmap_size(num_ssid, num_id)); ++ memset(set->bitmap, 0, idset_bitmap_size(num_ssid, num_id)); + } + return set; + } +@@ -41,7 +42,8 @@ void idset_free(struct idset *set) + + void idset_fill(struct idset *set) + { +- memset(set->bitmap, 0xff, bitmap_size(set->num_ssid, set->num_id)); ++ memset(set->bitmap, 0xff, ++ idset_bitmap_size(set->num_ssid, set->num_id)); + } + + static inline void idset_add(struct idset *set, int ssid, int id) diff --git a/queue-4.19/series b/queue-4.19/series index bf55ae43171..762a4dc9f15 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -9,3 +9,5 @@ fix-bitmap-corruption-on-close_range-with-close_range_unshare.patch selinux-fix-potential-counting-error-in-avc_add_xperms_decision.patch drm-amdgpu-actually-check-flags-for-all-context-ops.patch memcg_write_event_control-fix-a-user-triggerable-oops.patch +s390-cio-rename-bitmap_size-idset_bitmap_size.patch +btrfs-rename-bitmap_set_bits-btrfs_bitmap_set_bits.patch