From 7f205e22d78e92812c675877929c452092b88acd Mon Sep 17 00:00:00 2001 From: anserper Date: Tue, 30 Sep 2008 11:56:20 +0000 Subject: [PATCH] Branch b1_8_gate b=17059 i=ZhiYong Tian i=Johann Lombardi Always build quota support with client --- lustre/quota/quota_internal.h | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lustre/quota/quota_internal.h b/lustre/quota/quota_internal.h index a357cbf..fe99c9a 100644 --- a/lustre/quota/quota_internal.h +++ b/lustre/quota/quota_internal.h @@ -39,6 +39,8 @@ #include +#ifdef HAVE_QUOTA_SUPPORT + /* QUSG covnert bytes to blocks when counting block quota */ #define QUSG(count, isblk) (isblk ? toqb(count) : count) @@ -143,14 +145,9 @@ int dquot_create_oqaq(struct lustre_quota_ctxt *qctxt, struct lustre_dquot /* quota_ctl.c */ int mds_quota_ctl(struct obd_export *exp, struct obd_quotactl *oqctl); int filter_quota_ctl(struct obd_export *exp, struct obd_quotactl *oqctl); -int client_quota_ctl(struct obd_export *exp, struct obd_quotactl *oqctl); -int lov_quota_ctl(struct obd_export *exp, struct obd_quotactl *oqctl); /* quota_chk.c */ int target_quota_check(struct obd_export *exp, struct obd_quotactl *oqctl); -int client_quota_check(struct obd_export *exp, struct obd_quotactl *oqctl); -int lov_quota_check(struct obd_export *exp, struct obd_quotactl *oqctl); -int client_quota_poll_check(struct obd_export *exp, struct if_quotacheck *qchk); #ifdef LPROCFS void lprocfs_quotactl_test_init_vars(struct lprocfs_static_vars *lvars); @@ -168,13 +165,6 @@ static inline void lprocfs_quotacheck_test_init_vars } #endif -/* quota_adjust_qunit.c */ -int client_quota_adjust_qunit(struct obd_export *exp, - struct quota_adjust_qunit *oqaq, - struct lustre_quota_ctxt *qctxt); -int lov_quota_adjust_qunit(struct obd_export *exp, - struct quota_adjust_qunit *oqaq, - struct lustre_quota_ctxt *qctxt); int quota_adjust_slave_lqs(struct quota_adjust_qunit *oqaq, struct lustre_quota_ctxt *qctxt); void qdata_to_oqaq(struct qunit_data *qdata, @@ -212,3 +202,15 @@ extern cfs_proc_dir_entry_t *lquota_type_proc_dir; #endif +int client_quota_adjust_qunit(struct obd_export *exp, + struct quota_adjust_qunit *oqaq, + struct lustre_quota_ctxt *qctxt); +int lov_quota_adjust_qunit(struct obd_export *exp, + struct quota_adjust_qunit *oqaq, + struct lustre_quota_ctxt *qctxt); +int client_quota_ctl(struct obd_export *exp, struct obd_quotactl *oqctl); +int lov_quota_ctl(struct obd_export *exp, struct obd_quotactl *oqctl); +int client_quota_check(struct obd_export *exp, struct obd_quotactl *oqctl); +int lov_quota_check(struct obd_export *exp, struct obd_quotactl *oqctl); +int client_quota_poll_check(struct obd_export *exp, struct if_quotacheck *qchk); +#endif -- 1.8.3.1