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.
mds-objs += mds_fs.o lproc_mds.o mds_open.o mds_lib.o
ifeq ($(PATCHLEVEL),6)
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
+EXPORT_SYMBOL(qctxt_adjust_qunit);
int
qctxt_wait_on_dqacq(struct obd_device *obd, struct lustre_quota_ctxt *qctxt,
int
qctxt_wait_on_dqacq(struct obd_device *obd, struct lustre_quota_ctxt *qctxt,
+EXPORT_SYMBOL(qctxt_wait_on_dqacq);
int
qctxt_init(struct lustre_quota_ctxt *qctxt, struct super_block *sb,
int
qctxt_init(struct lustre_quota_ctxt *qctxt, struct super_block *sb,
+EXPORT_SYMBOL(qctxt_init);
void qctxt_cleanup(struct lustre_quota_ctxt *qctxt, int force)
{
void qctxt_cleanup(struct lustre_quota_ctxt *qctxt, int force)
{
spin_unlock(&qunit_hash_lock);
EXIT;
}
spin_unlock(&qunit_hash_lock);
EXIT;
}
+EXPORT_SYMBOL(qctxt_cleanup);
-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
obdfilter-objs := filter.o filter_io.o filter_log.o filter_san.o
obdfilter-objs += lproc_obdfilter.o filter_lvb.o
obdfilter-objs += filter_io_24.o
else
obdfilter-objs += filter_io_26.o
obdfilter-objs += filter_io_24.o
else
obdfilter-objs += filter_io_26.o
-obdfilter-objs += $(MDS)quota_context.o
endif # PATCHLEVEL
@INCLUDE_RULES@
endif # PATCHLEVEL
@INCLUDE_RULES@
ptlrpc_objs += pers.o lproc_ptlrpc.o
ptlrpc-objs := $(ldlm_objs) $(ptlrpc_objs)
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
default: all
ldlm_%.c: @LUSTRE@/ldlm/ldlm_%.c