Drop seq_file-add-a-seq_bprintf-function.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/seq_file-add-a-seq_bprintf-function.patch b/queue-5.10/seq_file-add-a-seq_bprintf-function.patch
deleted file mode 100644 (file)
index c400571..0000000
--- a/queue-5.10/seq_file-add-a-seq_bprintf-function.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 9962e90152e5c0e33b72e397a9f68f2886ed063b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 27 Apr 2021 19:43:12 +0200
-Subject: seq_file: Add a seq_bprintf function
-
-From: Florent Revest <revest@chromium.org>
-
-[ Upstream commit 76d6a13383b8e3ff20a9cf52aa9c3de39e485632 ]
-
-Similarly to seq_buf_bprintf in lib/seq_buf.c, this function writes a
-printf formatted string with arguments provided in a "binary
-representation" built by functions such as vbin_printf.
-
-Signed-off-by: Florent Revest <revest@chromium.org>
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Link: https://lore.kernel.org/bpf/20210427174313.860948-2-revest@chromium.org
-Stable-dep-of: 935d44acf621 ("memfd: check for non-NULL file_seals in memfd_create() syscall")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/seq_file.c            | 18 ++++++++++++++++++
- include/linux/seq_file.h |  4 ++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/fs/seq_file.c b/fs/seq_file.c
-index 472714716be69..ad2120d9f038d 100644
---- a/fs/seq_file.c
-+++ b/fs/seq_file.c
-@@ -415,6 +415,24 @@ void seq_printf(struct seq_file *m, const char *f, ...)
- }
- EXPORT_SYMBOL(seq_printf);
- 
-+#ifdef CONFIG_BINARY_PRINTF
-+void seq_bprintf(struct seq_file *m, const char *f, const u32 *binary)
-+{
-+      int len;
-+
-+      if (m->count < m->size) {
-+              len = bstr_printf(m->buf + m->count, m->size - m->count, f,
-+                                binary);
-+              if (m->count + len < m->size) {
-+                      m->count += len;
-+                      return;
-+              }
-+      }
-+      seq_set_overflow(m);
-+}
-+EXPORT_SYMBOL(seq_bprintf);
-+#endif /* CONFIG_BINARY_PRINTF */
-+
- /**
-  *    mangle_path -   mangle and copy path to buffer beginning
-  *    @s: buffer start
-diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
-index 662a8cfa1bcd3..6b80d0a3985a4 100644
---- a/include/linux/seq_file.h
-+++ b/include/linux/seq_file.h
-@@ -146,6 +146,10 @@ void *__seq_open_private(struct file *, const struct seq_operations *, int);
- int seq_open_private(struct file *, const struct seq_operations *, int);
- int seq_release_private(struct inode *, struct file *);
- 
-+#ifdef CONFIG_BINARY_PRINTF
-+void seq_bprintf(struct seq_file *m, const char *f, const u32 *binary);
-+#endif
-+
- #define DEFINE_SEQ_ATTRIBUTE(__name)                                  \
- static int __name ## _open(struct inode *inode, struct file *file)    \
- {                                                                     \
--- 
-2.39.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 8fab403d73c1cdc8a23221eab016d4eaab61e23a..cb2ab307734d5cee3434c146382a91ddad2cad16 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -25,7 +25,6 @@ io_uring-net-clear-msg_controllen-on-partial-sendmsg-retry.patch
 io_uring-net-disable-partial-retries-for-recvmsg-with-cmsg.patch
 nilfs2-prevent-general-protection-fault-in-nilfs_clear_dirty_page.patch
 x86-mm-avoid-using-set_pgd-outside-of-real-pgd-pages.patch
-seq_file-add-a-seq_bprintf-function.patch
 mm-pagealloc-sysctl-change-watermark_scale_factor-ma.patch
 sysctl-move-some-boundary-constants-from-sysctl.c-to.patch
 memfd-check-for-non-null-file_seals-in-memfd_create-.patch