diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-10-12 03:38:25 -0400 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-10-12 03:38:25 -0400 |
| commit | 1e2103cbf4adfd5490ee5f3ee59750bd70d2047e (patch) | |
| tree | fb8256698fc1098784ef0bedba22768a793679f4 /fs/xfs/xfs_buf.c | |
| parent | 8a56d7c305b9613dfe416fd1af06871ec34bb103 (diff) | |
| parent | 847f9f6875fb02b576035e3dc31f5e647b7617a7 (diff) | |
Merge branch 'xfs-misc-fixes-for-4.4-1' into for-next
Diffstat (limited to 'fs/xfs/xfs_buf.c')
| -rw-r--r-- | fs/xfs/xfs_buf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 90815c22b22d..3243cdf97f33 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c | |||
| @@ -354,7 +354,8 @@ retry: | |||
| 354 | */ | 354 | */ |
| 355 | if (!(++retries % 100)) | 355 | if (!(++retries % 100)) |
| 356 | xfs_err(NULL, | 356 | xfs_err(NULL, |
| 357 | "possible memory allocation deadlock in %s (mode:0x%x)", | 357 | "%s(%u) possible memory allocation deadlock in %s (mode:0x%x)", |
| 358 | current->comm, current->pid, | ||
| 358 | __func__, gfp_mask); | 359 | __func__, gfp_mask); |
| 359 | 360 | ||
| 360 | XFS_STATS_INC(bp->b_target->bt_mount, xb_page_retries); | 361 | XFS_STATS_INC(bp->b_target->bt_mount, xb_page_retries); |