Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-506 kernel: remove BKL fix
[fs/lustre-release.git]
/
lustre
/
lvfs
/
autoMakefile.am
diff --git
a/lustre/lvfs/autoMakefile.am
b/lustre/lvfs/autoMakefile.am
index
a7122cc
..
9fe7838
100644
(file)
--- a/
lustre/lvfs/autoMakefile.am
+++ b/
lustre/lvfs/autoMakefile.am
@@
-25,7
+25,7
@@
#
#
#
#
-# Copyright
2008 Sun Microsystems, Inc. All rights reserved
+# Copyright
(c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
# Use is subject to license terms.
#
@@
-36,7
+36,7
@@
if LIBLUSTRE
noinst_LIBRARIES = liblvfs.a
if LIBLUSTRE
noinst_LIBRARIES = liblvfs.a
-liblvfs_a_SOURCES = lvfs_userfs.c
prng.c
lvfs_lib.c
+liblvfs_a_SOURCES = lvfs_userfs.c lvfs_lib.c
liblvfs_a_CFLAGS = $(LLCFLAGS)
liblvfs_a_CPPFLAGS = $(LLCPPFLAGS)
liblvfs_a_CFLAGS = $(LLCFLAGS)
liblvfs_a_CPPFLAGS = $(LLCPPFLAGS)
@@
-52,9
+52,9
@@
if LINUX
modulefs_DATA := lvfs$(KMODEXT)
if SERVER
modulefs_DATA := lvfs$(KMODEXT)
if SERVER
-modulefs_DATA += fsfilt_
$(BACKINGFS)
$(KMODEXT)
+modulefs_DATA += fsfilt_
ldiskfs
$(KMODEXT)
-sources: fsfilt_
$(BACKINGFS)
.c
+sources: fsfilt_
ldiskfs
.c
touch sources
else #SERVER
touch sources
else #SERVER
@@
-68,10
+68,15
@@
ldiskfs_sed_flags = \
-e "s/DX_HASH/EXT3_DX_HASH/g" \
-e "s/reserve_window/ext3_reserve_window/g" \
-e "s/rsv_window_add/ext3_rsv_window_add/g" \
-e "s/DX_HASH/EXT3_DX_HASH/g" \
-e "s/reserve_window/ext3_reserve_window/g" \
-e "s/rsv_window_add/ext3_rsv_window_add/g" \
- -e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g"
+ -e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g" \
+ -e "s/EXT4/LDISKFS/g" -e "s/ext4/ldiskfs/g" \
+ -e "s/HAVE_LDISKFS_LDISKFS/HAVE_EXT4_LDISKFS/g"
fsfilt_ldiskfs.c: fsfilt_ext3.c
sed $(strip $(ldiskfs_sed_flags)) $< > $@
fsfilt_ldiskfs.c: fsfilt_ext3.c
sed $(strip $(ldiskfs_sed_flags)) $< > $@
+ if grep -q '^#define\(.*\)HAVE_EXT4_LDISKFS' @LDISKFS_DIR@/config.h ; then \
+ sed -i -e "/DEBUG_SUBSYSTEM\(.*\)S_FILTER/a\#define HAVE_EXT4_LDISKFS 1" $@ ;\
+ fi
fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h
sed $(strip $(ldiskfs_sed_flags)) $< > $@
fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h
sed $(strip $(ldiskfs_sed_flags)) $< > $@