From: niu <niu>
Date: Thu, 19 Aug 2004 04:55:31 +0000 (+0000)
Subject: - land b_mmap onto b1_4 (20040819_1212)
X-Git-Tag: v1_7_100~1^36~10
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9484122db8e08c14887f3ff2aec9eb5d7cb0e38a;p=fs%2Flustre-release.git

- land b_mmap onto b1_4 (20040819_1212)
---

diff --git a/lustre/kernel_patches/series/vanilla-2.4.24 b/lustre/kernel_patches/series/vanilla-2.4.24
index 6d2c4dd..1b0035f 100644
--- a/lustre/kernel_patches/series/vanilla-2.4.24
+++ b/lustre/kernel_patches/series/vanilla-2.4.24
@@ -39,3 +39,4 @@ inode-max-readahead-2.4.24.patch
 ext3-extents-2.4.24.patch
 ext3-extents-asyncdel-2.4.24.patch
 ext3-mballoc-2.4.24.patch
+export-zap-page-range.patch
diff --git a/lustre/llite/Makefile.mk b/lustre/llite/Makefile.mk
index 06dd10e..dabbd9e 100644
--- a/lustre/llite/Makefile.mk
+++ b/lustre/llite/Makefile.mk
@@ -8,4 +8,4 @@ include $(src)/../portals/Kernelenv
 obj-y += llite.o
 llite-objs := llite_lib.o dcache.o super.o rw.o \
 	super25.o file.o dir.o symlink.o namei.o lproc_llite.o \
-	rw26.o llite_nfs.o llite_close.o special.o
+	rw26.o llite_nfs.o llite_close.o special.o llite_mmap.o