Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / mm / backing-dev.c

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 50251749225885d958a1b531519326bd177ecf2e..d014ee5fcbbd2fa8004ae642f83571ddd949a5e6 100644 (file)
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -515,7 +515,6 @@ EXPORT_SYMBOL(bdi_destroy);
 int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
                           unsigned int cap)
 {
-       char tmp[32];
        int err;
 
        bdi->name = name;
@@ -524,8 +523,8 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
        if (err)
                return err;
 
-       sprintf(tmp, "%.28s%s", name, "-%d");
-       err = bdi_register(bdi, NULL, tmp, atomic_long_inc_return(&bdi_seq));
+       err = bdi_register(bdi, NULL, "%.28s-%ld", name,
+                          atomic_long_inc_return(&bdi_seq));
        if (err) {
                bdi_destroy(bdi);
                return err;