Branch HEAD

 b=19917
----------------------------------------------------------------------
Modified Files:
	lustre/ChangeLog lustre/obdfilter/filter_io.c
----------------------------------------------------------------------
Description: Drop unnecessary __GFP_NOMEMALLOC flag from filter_get_page()

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index d03dc67..a802682 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,6 +14,10 @@ tbd  Sun Microsystems, Inc.
         removed cwd "./" (refer to Bugzilla 14399).
        * File join has been disabled in this release, refer to Bugzilla 16929.
 
+Severity   : normal
+Bugzilla   : 19917
+Description: Drop unnecessary __GFP_NOMEMALLOC flag from filter_get_page()
+
 Severity   : enhancement
 Bugzilla   : 20539
 Description: Add support for OEL5.

diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c
index 925e5dc..089bb8e 100644 (file)
--- a/lustre/obdfilter/filter_io.c
+++ b/lustre/obdfilter/filter_io.c
@@ -283,7 +283,7 @@ static struct page *filter_get_page(struct obd_device *obd,
 
         page = find_or_create_page(inode->i_mapping, offset >> CFS_PAGE_SHIFT,
                                    (localreq ? (GFP_NOFS | __GFP_HIGHMEM)
-                                             : (GFP_HIGHUSER | __GFP_NOMEMALLOC)));
+                                             : GFP_HIGHUSER));
         if (unlikely(page == NULL))
                 lprocfs_counter_add(obd->obd_stats, LPROC_FILTER_NO_PAGE, 1);