From 54e366cc7bd755f2400900f8a0491a4fdf105b8e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 9 Aug 2021 16:10:59 +0200 Subject: [PATCH] Revert "bdi: add a ->dev_name field to struct backing_dev_info" This reverts commit d6c434ae9d3b5cd1fcb8e3aa28172f3d79d81641 which is commit 6bd87eec23cbc9ed222bed0f5b5b02bf300e9a8d upstream. It breaks the Android KABI and is not needed in this branch at this point in time. Signed-off-by: Greg Kroah-Hartman Change-Id: I69a71f7ae3dca4c5bec52b31dcc082ad1c343220 --- include/linux/backing-dev-defs.h | 1 - mm/backing-dev.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h index 65d47522413c..07e02d6df5ad 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -197,7 +197,6 @@ struct backing_dev_info { wait_queue_head_t wb_waitq; struct device *dev; - char dev_name[64]; struct device *owner; struct timer_list laptop_mode_wb_timer; diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 1d37c80d023a..8501b033bca8 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -880,8 +880,7 @@ int bdi_register_va(struct backing_dev_info *bdi, const char *fmt, va_list args) if (bdi->dev) /* The driver needs to use separate queues per device */ return 0; - vsnprintf(bdi->dev_name, sizeof(bdi->dev_name), fmt, args); - dev = device_create(bdi_class, NULL, MKDEV(0, 0), bdi, bdi->dev_name); + dev = device_create_vargs(bdi_class, NULL, MKDEV(0, 0), bdi, fmt, args); if (IS_ERR(dev)) return PTR_ERR(dev); @@ -981,7 +980,7 @@ const char *bdi_dev_name(struct backing_dev_info *bdi) { if (!bdi || !bdi->dev) return bdi_unknown_name; - return bdi->dev_name; + return dev_name(bdi->dev); } EXPORT_SYMBOL_GPL(bdi_dev_name);