Branch b1_8

 b=19917
----------------------------------------------------------------------
  Tag: b1_8
 	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 c8645bd..b3340c5 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -16,6 +16,10 @@ tbd Sun Microsystems, Inc.
          more information, please refer to bugzilla 17630.
 
 Severity   : normal
+Bugzilla   : 19917
+Description: Drop unnecessary __GFP_NOMEMALLOC flag from filter_get_page()
+
+Severity   : normal
 Bugzilla   : 20482
 Description: Conf-sanity.sh 50g test - deactivated OST should not cause a panic.
 

diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c
index 2cd4956..d579f5f 100644 (file)
--- a/lustre/obdfilter/filter_io.c
+++ b/lustre/obdfilter/filter_io.c
@@ -282,7 +282,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);