From: Dave Chinner <david@fromorbit.com>
Date: Mon, 12 Oct 2015 07:38:25 +0000 (+1100)
Subject: Merge branch 'xfs-misc-fixes-for-4.4-1' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1e2103cbf4adfd5490ee5f3ee59750bd70d2047e;p=linux-beck.git

Merge branch 'xfs-misc-fixes-for-4.4-1' into for-next
---

1e2103cbf4adfd5490ee5f3ee59750bd70d2047e
diff --cc fs/xfs/xfs_buf.c
index 90815c22b22d,cac62e14d73a..3243cdf97f33
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@@ -354,10 -354,11 +354,11 @@@ retry
  			 */
  			if (!(++retries % 100))
  				xfs_err(NULL,
- 		"possible memory allocation deadlock in %s (mode:0x%x)",
+ 		"%s(%u) possible memory allocation deadlock in %s (mode:0x%x)",
+ 					current->comm, current->pid,
  					__func__, gfp_mask);
  
 -			XFS_STATS_INC(xb_page_retries);
 +			XFS_STATS_INC(bp->b_target->bt_mount, xb_page_retries);
  			congestion_wait(BLK_RW_ASYNC, HZ/50);
  			goto retry;
  		}