From 765fae75c663bce7b0ffbe0eb66026367da7e9e3 Mon Sep 17 00:00:00 2001 From: anserper Date: Tue, 30 Sep 2008 11:56:00 +0000 Subject: [PATCH] Branch b1_8_gate b=17059 i=ZhiYong Tian i=Johann Lombardi Always build quota support with client --- lustre/include/obd_class.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h index 3ddc4f0..0df4589 100644 --- a/lustre/include/obd_class.h +++ b/lustre/include/obd_class.h @@ -1461,7 +1461,6 @@ static inline int obd_notify_observer(struct obd_device *observer, return rc1 ?: rc2; } -#ifdef HAVE_QUOTA_SUPPORT static inline int obd_quotacheck(struct obd_export *exp, struct obd_quotactl *oqctl) { @@ -1492,7 +1491,7 @@ static inline int obd_quota_adjust_qunit(struct obd_export *exp, struct quota_adjust_qunit *oqaq, struct lustre_quota_ctxt *qctxt) { -#ifdef LPROCFS +#if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT) struct timeval work_start; struct timeval work_end; long timediff; @@ -1500,7 +1499,7 @@ static inline int obd_quota_adjust_qunit(struct obd_export *exp, int rc; ENTRY; -#ifdef LPROCFS +#if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT) if (qctxt) do_gettimeofday(&work_start); #endif @@ -1509,7 +1508,7 @@ static inline int obd_quota_adjust_qunit(struct obd_export *exp, rc = OBP(exp->exp_obd, quota_adjust_qunit)(exp, oqaq, qctxt); -#ifdef LPROCFS +#if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT) if (qctxt) { do_gettimeofday(&work_end); timediff = cfs_timeval_sub(&work_end, &work_start, NULL); @@ -1519,7 +1518,6 @@ static inline int obd_quota_adjust_qunit(struct obd_export *exp, #endif RETURN(rc); } -#endif static inline int obd_health_check(struct obd_device *obd) { -- 1.8.3.1