| From: SeongJae Park <sj@kernel.org> |
| Subject: mm/damon/dbgfs: make debugfs interface deprecation message a macro |
| Date: Mon, 29 Jan 2024 17:35:43 -0800 |
| |
| DAMON debugfs interface deprecation message is written twice, once for the |
| warning, and again for DEPRECATED file's read output. De-duplicate those |
| by defining the message as a macro and reuse. |
| |
| [akpm@linux-foundation.org: s/comnst/const/] |
| Link: https://lkml.kernel.org/r/20240130013549.89538-5-sj@kernel.org |
| Signed-off-by: SeongJae Park <sj@kernel.org> |
| Cc: Alex Shi <alexs@kernel.org> |
| Cc: Hu Haowen <2023002089@link.tyut.edu.cn> |
| Cc: Jonathan Corbet <corbet@lwn.net> |
| Cc: Shuah Khan <shuah@kernel.org> |
| Cc: Yanteng Si <siyanteng@loongson.cn> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| mm/damon/dbgfs.c | 15 +++++++-------- |
| 1 file changed, 7 insertions(+), 8 deletions(-) |
| |
| --- a/mm/damon/dbgfs.c~mm-damon-dbgfs-make-debugfs-interface-deprecation-message-a-macro |
| +++ a/mm/damon/dbgfs.c |
| @@ -15,6 +15,11 @@ |
| #include <linux/page_idle.h> |
| #include <linux/slab.h> |
| |
| +#define DAMON_DBGFS_DEPRECATION_NOTICE \ |
| + "DAMON debugfs interface is deprecated, so users should move " \ |
| + "to DAMON_SYSFS. If you cannot, please report your usecase to " \ |
| + "damon@lists.linux.dev and linux-mm@kvack.org.\n" |
| + |
| static struct damon_ctx **dbgfs_ctxs; |
| static int dbgfs_nr_ctxs; |
| static struct dentry **dbgfs_dirs; |
| @@ -22,10 +27,7 @@ static DEFINE_MUTEX(damon_dbgfs_lock); |
| |
| static void damon_dbgfs_warn_deprecation(void) |
| { |
| - pr_warn_once("DAMON debugfs interface is deprecated, " |
| - "so users should move to DAMON_SYSFS. If you cannot, " |
| - "please report your usecase to damon@lists.linux.dev and " |
| - "linux-mm@kvack.org.\n"); |
| + pr_warn_once(DAMON_DBGFS_DEPRECATION_NOTICE); |
| } |
| |
| /* |
| @@ -808,10 +810,7 @@ static void dbgfs_destroy_ctx(struct dam |
| static ssize_t damon_dbgfs_deprecated_read(struct file *file, |
| char __user *buf, size_t count, loff_t *ppos) |
| { |
| - static const char kbuf[512] = "DAMON debugfs interface is deprecated, " |
| - "so users should move to DAMON_SYSFS. If you cannot, " |
| - "please report your usecase to damon@lists.linux.dev and " |
| - "linux-mm@kvack.org.\n"; |
| + static const char kbuf[512] = DAMON_DBGFS_DEPRECATION_NOTICE; |
| |
| return simple_read_from_buffer(buf, count, ppos, kbuf, strlen(kbuf)); |
| } |
| _ |
