Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container...

[mirror_ubuntu-artful-kernel.git] / fs / xfs / kmem.c

diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index a7a3a63bb360c098889dab8341ac656ddbd348af..686ba6fb20ddc942638f6e698b98bf4c1bb8785f 100644 (file)
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -55,8 +55,9 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
                        return ptr;
                if (!(++retries % 100))
                        xfs_err(NULL,
-               "possible memory allocation deadlock in %s (mode:0x%x)",
-                                       __func__, lflags);
+       "%s(%u) possible memory allocation deadlock size %u in %s (mode:0x%x)",
+                               current->comm, current->pid,
+                               (unsigned int)size, __func__, lflags);
                congestion_wait(BLK_RW_ASYNC, HZ/50);
        } while (1);
 }
@@ -120,8 +121,9 @@ kmem_zone_alloc(kmem_zone_t *zone, xfs_km_flags_t flags)
                        return ptr;
                if (!(++retries % 100))
                        xfs_err(NULL,
-               "possible memory allocation deadlock in %s (mode:0x%x)",
-                                       __func__, lflags);
+               "%s(%u) possible memory allocation deadlock in %s (mode:0x%x)",
+                               current->comm, current->pid,
+                               __func__, lflags);
                congestion_wait(BLK_RW_ASYNC, HZ/50);
        } while (1);
 }