GFS2: Fix "truncate in progress" hang

[linux-2.6-omap-h63xx.git] / lib / vsprintf.c

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 6897724ff5df0731e717305afaaca37112ec5897..98d632277ca8c932add9d0daf666dd1795c7f785 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -661,6 +661,9 @@ static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width,
  */
 static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field_width, int precision, int flags)
 {
+       if (!ptr)
+               return string(buf, end, "(null)", field_width, precision, flags);
+
        switch (*fmt) {
        case 'F':
                ptr = dereference_function_descriptor(ptr);
@@ -669,6 +672,9 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field
                return symbol_string(buf, end, ptr, field_width, precision, flags);
        case 'R':
                return resource_string(buf, end, ptr, field_width, precision, flags);
+       case 'm':
+               flags |= SPECIAL;
+               /* Fallthrough */
        case 'M':
                return mac_address_string(buf, end, ptr, field_width, precision, flags);
        case 'i':