diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-03-13 19:13:05 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-03-13 19:13:05 +1100 |
| commit | 5f44e4c185ec5a4a438841cbd4983d0c4a106a4a (patch) | |
| tree | 894419c679250407eb7a76af9d1525c47226a085 /fs/xfs/xfs_buf.c | |
| parent | 49ae4b97d760d2e63394b96a7e14cbb43b9dc942 (diff) | |
| parent | fe4c224aa1ffa4352849ac5f452de7132739bee2 (diff) | |
Merge branch 'xfs-bug-fixes-for-3.15-2' into for-next
Diffstat (limited to 'fs/xfs/xfs_buf.c')
| -rw-r--r-- | fs/xfs/xfs_buf.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 9c061ef2b0d..107f2fdfe41 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -396,7 +396,17 @@ _xfs_buf_map_pages( bp->b_addr = NULL; } else { int retried = 0; + unsigned noio_flag; + /* + * vm_map_ram() will allocate auxillary structures (e.g. + * pagetables) with GFP_KERNEL, yet we are likely to be under + * GFP_NOFS context here. Hence we need to tell memory reclaim + * that we are in such a context via PF_MEMALLOC_NOIO to prevent + * memory reclaim re-entering the filesystem here and + * potentially deadlocking. + */ + noio_flag = memalloc_noio_save(); do { bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count, -1, PAGE_KERNEL); @@ -404,6 +414,7 @@ _xfs_buf_map_pages( break; vm_unmap_aliases(); } while (retried++ <= 1); + memalloc_noio_restore(noio_flag); if (!bp->b_addr) return -ENOMEM; |