Branch HEAD

Move quota support from ldiskfs to lvfs.

b=11981
r=adilger
r=nathan

diff --git a/ldiskfs/ldiskfs/Makefile.in b/ldiskfs/ldiskfs/Makefile.in
index e52e62f..eeb1bed 100644 (file)
--- a/ldiskfs/ldiskfs/Makefile.in
+++ b/ldiskfs/ldiskfs/Makefile.in
@@ -2,8 +2,6 @@ default: all
 
 MODULES := ldiskfs
 
-@QUOTA_TRUE@MODULES += quotafmt_test
-
 # copy makefile over to not break patches
 ext3_extra := $(wildcard @LINUX@/fs/ext3/Makefile)
 
@@ -16,14 +14,8 @@ new_headers := ext3_extents.h
 ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
 ldiskfs_sources := $(ldiskfs_patched_sources)
 
-quotafmt_sources := lustre_quota_fmt.c
-quotafmt_headers := lustre_quota_fmt.h
-@QUOTA_TRUE@ldiskfs_sources += $(quotafmt_sources) $(quotafmt_headers)
-
 ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))
 
-@QUOTA_TRUE@quotafmt-objs := quotafmt_test.o
-
 EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs
 
 @INCLUDE_RULES@

diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am
index 7e378c2..8ac1b87 100644 (file)
--- a/ldiskfs/ldiskfs/autoMakefile.am
+++ b/ldiskfs/ldiskfs/autoMakefile.am
@@ -76,7 +76,5 @@ foo-check:
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = sources $(notdir $(linux_headers) $(ext3_headers) $(ext3_sources) $(new_sources) $(new_headers))
 
-EXTRA_DIST := lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c
-
 clean: clean-am
        rm -rf linux linux-stage

diff --git a/lustre/ldiskfs/Makefile.in b/lustre/ldiskfs/Makefile.in
index e52e62f..eeb1bed 100644 (file)
--- a/lustre/ldiskfs/Makefile.in
+++ b/lustre/ldiskfs/Makefile.in
@@ -2,8 +2,6 @@ default: all
 
 MODULES := ldiskfs
 
-@QUOTA_TRUE@MODULES += quotafmt_test
-
 # copy makefile over to not break patches
 ext3_extra := $(wildcard @LINUX@/fs/ext3/Makefile)
 
@@ -16,14 +14,8 @@ new_headers := ext3_extents.h
 ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
 ldiskfs_sources := $(ldiskfs_patched_sources)
 
-quotafmt_sources := lustre_quota_fmt.c
-quotafmt_headers := lustre_quota_fmt.h
-@QUOTA_TRUE@ldiskfs_sources += $(quotafmt_sources) $(quotafmt_headers)
-
 ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))
 
-@QUOTA_TRUE@quotafmt-objs := quotafmt_test.o
-
 EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs
 
 @INCLUDE_RULES@

diff --git a/lustre/ldiskfs/autoMakefile.am b/lustre/ldiskfs/autoMakefile.am
index 7e378c2..8ac1b87 100644 (file)
--- a/lustre/ldiskfs/autoMakefile.am
+++ b/lustre/ldiskfs/autoMakefile.am
@@ -76,7 +76,5 @@ foo-check:
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = sources $(notdir $(linux_headers) $(ext3_headers) $(ext3_sources) $(new_sources) $(new_headers))
 
-EXTRA_DIST := lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c
-
 clean: clean-am
        rm -rf linux linux-stage

diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in
index 585f5a6..2e31097 100644 (file)
--- a/lustre/lvfs/Makefile.in
+++ b/lustre/lvfs/Makefile.in
@@ -1,7 +1,11 @@
 MODULES := lvfs
 @SERVER_TRUE@MODULES += fsfilt_@BACKINGFS@
+@QUOTA_TRUE@MODULES += quotafmt_test
 
 lvfs-objs := lvfs_common.o lvfs_linux.o fsfilt.o upcall_cache.o
+@QUOTA_TRUE@lvfs-objs += lustre_quota_fmt.o
+
+@QUOTA_TRUE@quotafmt-objs := quotafmt_test.o
 
 ifeq ($(PATCHLEVEL),6)
 fsfilt_@BACKINGFS@-objs := fsfilt-@BACKINGFS@.o

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index 9185580..61d8fdf 100644 (file)
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -2,7 +2,6 @@
 #
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
-
 if LIBLUSTRE
 noinst_LIBRARIES = liblvfs.a
 liblvfs_a_SOURCES = lvfs_userfs.c
@@ -74,7 +73,9 @@ install-data-hook: $(install_data_hook)
 DIST_SOURCES = fsfilt.c fsfilt_ext3.c fsfilt_reiserfs.c lvfs_common.c \
        lvfs_internal.h lvfs_linux.c lvfs_userfs.c \
        upcall_cache.c \
+       lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c \
         # quotacheck_test.c quotactl_test.c fsfilt_ext3_quota.h
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = fsfilt-*.c fsfilt_ldiskfs.c fsfilt_extN.c sources
+

diff --git a/lustre/ldiskfs/lustre_quota_fmt.c b/lustre/lvfs/lustre_quota_fmt.c
similarity index 100%
rename from lustre/ldiskfs/lustre_quota_fmt.c
rename to lustre/lvfs/lustre_quota_fmt.c

diff --git a/lustre/ldiskfs/lustre_quota_fmt.h b/lustre/lvfs/lustre_quota_fmt.h
similarity index 100%
rename from lustre/ldiskfs/lustre_quota_fmt.h
rename to lustre/lvfs/lustre_quota_fmt.h

diff --git a/lustre/ldiskfs/quotafmt_test.c b/lustre/lvfs/quotafmt_test.c
similarity index 100%
rename from lustre/ldiskfs/quotafmt_test.c
rename to lustre/lvfs/quotafmt_test.c