LU-2337 scripts: init script to not use -d with zpool import

[fs/lustre-release.git] / lustre / kernel_patches / patches / raid5-zerocopy-rhel5.patch

diff --git a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch
index ccfb87b..06db94d 100644 (file)
--- a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch
+++ b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch
@@ -385,7 +385,7 @@ Index: linux-2.6.18-128.1.6/include/linux/page-flags.h
  #define PG_reclaim            17      /* To be reclaimed asap */
  #define PG_nosave_free                18      /* Free, should not be written */
  #define PG_buddy              19      /* Page is free, on buddy lists */
-+#define PG_constant           20      /* To mark if the page is constant */
++#define PG_constant           21      /* To mark if the page is constant */
  #define PG_xpmem              27      /* Testing for xpmem. */
  
  /* PG_owner_priv_1 users should have descriptive aliases */
@@ -428,9 +428,9 @@ Index: linux-2.6.18-128.1.6/mm/filemap.c
  #include <linux/syscalls.h>
  #include <linux/cpuset.h>
 +#include <linux/rmap.h>
- #include "filemap.h"
+ #include <linux/hardirq.h> /* for BUG_ON(!in_atomic()) only */
+ #include <trace/mm.h>
  #include "internal.h"
- 
 @@ -567,11 +568,55 @@
                if (!test_clear_page_writeback(page))
                        BUG();