fs: use block_device name vsprintf helper

[linux-beck.git] / fs / ext2 / xattr.c

diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 0b6bfd3a398bd320cf8bbbbe81745f364decd765..a21c259b5fdebc9f4c5b1aa55e7cbf1818ce670c 100644 (file)
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -77,10 +77,8 @@
                printk("\n"); \
        } while (0)
 # define ea_bdebug(bh, f...) do { \
-               char b[BDEVNAME_SIZE]; \
-               printk(KERN_DEBUG "block %s:%lu: ", \
-                       bdevname(bh->b_bdev, b), \
-                       (unsigned long) bh->b_blocknr); \
+               printk(KERN_DEBUG "block %pg:%lu: ", \
+                       bh->b_bdev, (unsigned long) bh->b_blocknr); \
                printk(f); \
                printk("\n"); \
        } while (0)
@@ -293,10 +291,9 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
                        ext2_xattr_handler(entry->e_name_index);
 
                if (handler) {
-                       size_t size = handler->list(dentry, buffer, rest,
-                                                   entry->e_name,
-                                                   entry->e_name_len,
-                                                   handler->flags);
+                       size_t size = handler->list(handler, dentry, buffer,
+                                                   rest, entry->e_name,
+                                                   entry->e_name_len);
                        if (buffer) {
                                if (size > rest) {
                                        error = -ERANGE;