b=6233

originally from oleg, r=jacob

Build quota_context as part of ptlrpc, so it can be shared by the mds
and obdfilter without being linked into both, which sometimes causes
build failures on lester.

diff --git a/lustre/mds/Makefile.in b/lustre/mds/Makefile.in
index b3b3648..a7882cc 100644 (file)
--- a/lustre/mds/Makefile.in
+++ b/lustre/mds/Makefile.in
@@ -3,7 +3,7 @@ mds-objs := mds_log.o mds_unlink_open.o mds_lov.o handler.o mds_reint.o
 mds-objs += mds_fs.o lproc_mds.o mds_open.o mds_lib.o
 
 ifeq ($(PATCHLEVEL),6)
-mds-objs += quota_context.o quota_master.o
+mds-objs += quota_master.o
 endif
 
 @INCLUDE_RULES@

diff --git a/lustre/mds/quota_context.c b/lustre/mds/quota_context.c
index 907255a..c0bda90 100644 (file)
--- a/lustre/mds/quota_context.c
+++ b/lustre/mds/quota_context.c
@@ -510,6 +510,7 @@ next:
 
         RETURN(rc);
 }
+EXPORT_SYMBOL(qctxt_adjust_qunit);
 
 int
 qctxt_wait_on_dqacq(struct obd_device *obd, struct lustre_quota_ctxt *qctxt,
@@ -541,6 +542,7 @@ next:
 
         RETURN(rc);
 }
+EXPORT_SYMBOL(qctxt_wait_on_dqacq);
 
 int
 qctxt_init(struct lustre_quota_ctxt *qctxt, struct super_block *sb,
@@ -564,6 +566,7 @@ qctxt_init(struct lustre_quota_ctxt *qctxt, struct super_block *sb,
 
         RETURN(0);
 }
+EXPORT_SYMBOL(qctxt_init);
 
 void qctxt_cleanup(struct lustre_quota_ctxt *qctxt, int force)
 {
@@ -586,3 +589,4 @@ void qctxt_cleanup(struct lustre_quota_ctxt *qctxt, int force)
         spin_unlock(&qunit_hash_lock);
         EXIT;
 }
+EXPORT_SYMBOL(qctxt_cleanup);

diff --git a/lustre/obdfilter/Makefile.in b/lustre/obdfilter/Makefile.in
index eef89e8..0f25c77 100644 (file)
--- a/lustre/obdfilter/Makefile.in
+++ b/lustre/obdfilter/Makefile.in
@@ -1,5 +1,5 @@
 MODULES := obdfilter
-MDS :=  @top_srcdir@/lustre/mds/
+
 obdfilter-objs := filter.o filter_io.o filter_log.o filter_san.o
 obdfilter-objs += lproc_obdfilter.o filter_lvb.o
 
@@ -7,7 +7,6 @@ ifeq ($(PATCHLEVEL),4)
 obdfilter-objs += filter_io_24.o
 else
 obdfilter-objs += filter_io_26.o
-obdfilter-objs += $(MDS)quota_context.o
 endif # PATCHLEVEL 
 
 @INCLUDE_RULES@

diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
index 54f5a9d..85b84ec 100644 (file)
--- a/lustre/ptlrpc/Makefile.in
+++ b/lustre/ptlrpc/Makefile.in
@@ -15,6 +15,11 @@ ptlrpc_objs += llog_net.o llog_client.o llog_server.o import.o ptlrpcd.o
 ptlrpc_objs += pers.o lproc_ptlrpc.o
 
 ptlrpc-objs := $(ldlm_objs) $(ptlrpc_objs)
+
+ifeq ($(PATCHLEVEL),6)
+ptlrpc-objs += @top_srcdir@/lustre/mds/quota_context.o
+endif
+
 default: all
 
 ldlm_%.c: @LUSTRE@/ldlm/ldlm_%.c