Merge tag 'iommu-updates-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-bionic-kernel.git] / fs / ext4 / mballoc.h

diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h
index 08481ee84cd58028c694a5713be5a63ee54a8821..d634e183b4d4b3034c05520254c87a77bed90200 100644 (file)
--- a/fs/ext4/mballoc.h
+++ b/fs/ext4/mballoc.h
@@ -48,7 +48,7 @@ extern ushort ext4_mballoc_debug;
                }                                                       \
        } while (0)
 #else
-#define mb_debug(n, fmt, a...)
+#define mb_debug(n, fmt, a...)         no_printk(fmt, ## a)
 #endif
 
 #define EXT4_MB_HISTORY_ALLOC          1       /* allocation */
@@ -175,8 +175,6 @@ struct ext4_allocation_context {
        /* copy of the best found extent taken before preallocation efforts */
        struct ext4_free_extent ac_f_ex;
 
-       /* number of iterations done. we have to track to limit searching */
-       unsigned long ac_ex_scanned;
        __u16 ac_groups_scanned;
        __u16 ac_found;
        __u16 ac_tail;