From edf7461e6dc7a47681d5aef12a64ef9d312faea0 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 29 Nov 2012 08:37:03 -0600
Subject: [PATCH] --- yaml --- r: 347603 b: refs/heads/master c:
 d2cc4dde9206aa2c7fb237aa689d3277cc070547 h: refs/heads/master i:   347601:
 7c3fc338967253fe61e636f5f9262ae26655995f   347599:
 1297d16be6963caa438f68a318ab3ad3be37a4ac v: v3

---
 [refs]                            | 2 +-
 trunk/fs/ceph/super.c             | 2 +-
 trunk/include/linux/backing-dev.h | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e9ab9a3b5462..9d446114ece9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83aff95eb9d60aff5497e9f44a2ae906b86d8e88
+refs/heads/master: d2cc4dde9206aa2c7fb237aa689d3277cc070547
diff --git a/trunk/fs/ceph/super.c b/trunk/fs/ceph/super.c
index fcda1c73a1e5..1a144001b2e1 100644
--- a/trunk/fs/ceph/super.c
+++ b/trunk/fs/ceph/super.c
@@ -842,7 +842,7 @@ static int ceph_register_bdi(struct super_block *sb,
 		fsc->backing_dev_info.ra_pages =
 			default_backing_dev_info.ra_pages;
 
-	err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%d",
+	err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
 			   atomic_long_inc_return(&bdi_seq));
 	if (!err)
 		sb->s_bdi = &fsc->backing_dev_info;
diff --git a/trunk/include/linux/backing-dev.h b/trunk/include/linux/backing-dev.h
index 2a9a9abc9126..12731a19ef06 100644
--- a/trunk/include/linux/backing-dev.h
+++ b/trunk/include/linux/backing-dev.h
@@ -114,6 +114,7 @@ struct backing_dev_info {
 int bdi_init(struct backing_dev_info *bdi);
 void bdi_destroy(struct backing_dev_info *bdi);
 
+__printf(3, 4)
 int bdi_register(struct backing_dev_info *bdi, struct device *parent,
 		const char *fmt, ...);
 int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev);