Whamcloud - gitweb
LU-432 QUOTA_OK / NO_QUOTA definitions
authorChristos Triantafyllidis <ctria@grid.auth.gr>
Sat, 18 Jun 2011 21:25:24 +0000 (00:25 +0300)
committerJohann Lombardi <johann@whamcloud.com>
Fri, 15 Jul 2011 06:15:32 +0000 (23:15 -0700)
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 <ctria@grid.auth.gr>
Reviewed-on: http://review.whamcloud.com/973
Tested-by: Hudson
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
lustre/include/linux/lustre_compat25.h
lustre/quota/quota_interface.c

index 81865d0..0783b7b 100644 (file)
@@ -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 */
index 939c495..dc6f6da 100644 (file)
 # include <liblustre.h>
 #endif
 
+/* Linux 2.6.34+ no longer define QUOTA_OK */
+#ifndef QUOTA_OK
+#define QUOTA_OK 0
+#endif
+
 #include <obd_class.h>
 #include <lustre_mds.h>
 #include <lustre_dlm.h>