From 7546c36e8f4f0fd154af9ee28123c30da8f02ad6 Mon Sep 17 00:00:00 2001 From: Christos Triantafyllidis Date: Sun, 19 Jun 2011 00:25:24 +0300 Subject: [PATCH] LU-432 QUOTA_OK / NO_QUOTA definitions Starting from kernel 2.6.34 the definitions of QUOTA_OK and NO_QUOTA have been removed from linux kernel (linux/quota.h). This adds the needed definitions to the relevant files. Change-Id: I9b67ea491a34777c2ea5ff86630788cec18ebcf6 Signed-off-by: Christos Triantafyllidis Reviewed-on: http://review.whamcloud.com/973 Tested-by: Hudson Reviewed-by: Andreas Dilger Reviewed-by: Johann Lombardi --- lustre/include/linux/lustre_compat25.h | 5 +++++ lustre/quota/quota_interface.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index 81865d0..0783b7b 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -695,5 +695,10 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) #define queue_max_hw_segments(rq) queue_max_segments(rq) #endif +/* Linux 2.6.34+ no longer define NO_QUOTA */ +#ifndef NO_QUOTA +#define NO_QUOTA 1 +#endif + #endif /* __KERNEL__ */ #endif /* _COMPAT25_H */ diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c index 939c495..dc6f6da 100644 --- a/lustre/quota/quota_interface.c +++ b/lustre/quota/quota_interface.c @@ -52,6 +52,11 @@ # include #endif +/* Linux 2.6.34+ no longer define QUOTA_OK */ +#ifndef QUOTA_OK +#define QUOTA_OK 0 +#endif + #include #include #include -- 1.8.3.1