[Devel] [PATCH RHEL7 COMMIT] Revert diff-ubc-allocate-bdev-cache-with-__GFP_NOFAIL

[Vladimir Davydov]

The commit is pushed to "branch-rh7-3.10.0-229.7.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.6.8
------>
commit 1e9768ad35ab150319bf005757588d9437b8d00e
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Tue Sep 8 19:30:59 2015 +0400

    Revert diff-ubc-allocate-bdev-cache-with-__GFP_NOFAIL
    
    The hunk being reverted was brought by the initial commit 2a8b5de959180.
    The problem this hunk addresses, i.e. potential live lock in
    grow_dev_page (see PSBM-12523 for more details), has been fixed upstream
    and the following patch backports the fix.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
---
 fs/buffer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/buffer.c b/fs/buffer.c
index 7850c9b50f20..2d0e29193feb 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1014,8 +1014,7 @@ grow_dev_page(struct block_device *bdev, sector_t block,
 	int ret = 0;		/* Will call free_more_memory() */
 
 	page = find_or_create_page(inode->i_mapping, index,
-		(mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS) |
-		__GFP_MOVABLE | __GFP_NOFAIL);
+		(mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS)|__GFP_MOVABLE);
 	if (!page)
 		return ret;