commit:     b272cc35dd8f1921dc27a1ada2e9f03ec3bffa8e
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 11:49:27 2024 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri May 17 11:49:27 2024 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=b272cc35

Remove redundant patch

Removed:
2930_gcc14-btrfs-fix-kvcalloc-args-order.patch

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 0000_README                                    |  4 ---
 2930_gcc14-btrfs-fix-kvcalloc-args-order.patch | 37 --------------------------
 2 files changed, 41 deletions(-)

diff --git a/0000_README b/0000_README
index badcf846..6e0616bb 100644
--- a/0000_README
+++ b/0000_README
@@ -203,10 +203,6 @@ Patch:  2920_sign-file-patch-for-libressl.patch
 From:   https://bugs.gentoo.org/717166
 Desc:   sign-file: full functionality with modern LibreSSL
 
-Patch:  2930_gcc14-btrfs-fix-kvcalloc-args-order.patch
-From:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-Desc:   btrfs: fix kvcalloc() arguments order
-
 Patch:  2931_gcc14-drm-i915-Adapt-to-Walloc-size.patch
 From:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 Desc:   drm: i915: Adapt to -Walloc-size

diff --git a/2930_gcc14-btrfs-fix-kvcalloc-args-order.patch 
b/2930_gcc14-btrfs-fix-kvcalloc-args-order.patch
deleted file mode 100644
index 0ed049e2..00000000
--- a/2930_gcc14-btrfs-fix-kvcalloc-args-order.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Subject: [gcc-14 PATCH] btrfs: fix kvcalloc() arguments order
-
-When compiling with gcc version 14.0.0 20231220 (experimental)
-and W=1, I've noticed the following warning:
-
-fs/btrfs/send.c: In function 'btrfs_ioctl_send':
-fs/btrfs/send.c:8208:44: warning: 'kvcalloc' sizes specified with 'sizeof'
-in the earlier argument and not in the later argument 
[-Wcalloc-transposed-args]
- 8208 |         sctx->clone_roots = kvcalloc(sizeof(*sctx->clone_roots),
-      |                                            ^
-
-Since 'n' and 'size' arguments of 'kvcalloc()' are multiplied to
-calculate the final size, their actual order doesn't affect the
-result and so this is not a bug. But it's still worth to fix it.
-
-Link: 
https://lore.kernel.org/linux-btrfs/20231221084748.10094-1-dmanti...@yandex.ru/T/#u
----
- fs/btrfs/send.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
-index 4e36550618e5..2d7519a6ce72 100644
---- a/fs/btrfs/send.c
-+++ b/fs/btrfs/send.c
-@@ -8205,8 +8205,8 @@ long btrfs_ioctl_send(struct inode *inode, struct 
btrfs_ioctl_send_args *arg)
-               goto out;
-       }
- 
--      sctx->clone_roots = kvcalloc(sizeof(*sctx->clone_roots),
--                                   arg->clone_sources_count + 1,
-+      sctx->clone_roots = kvcalloc(arg->clone_sources_count + 1,
-+                                   sizeof(*sctx->clone_roots),
-                                    GFP_KERNEL);
-       if (!sctx->clone_roots) {
-               ret = -ENOMEM;
--- 
-2.43.0

Reply via email to