LU-9503 kernel: kernel update [SLES11 SP4 3.0.101-100]

[fs/lustre-release.git] / lustre / include / lustre_quota.h

diff --git a/lustre/include/lustre_quota.h b/lustre/include/lustre_quota.h
index b7ecbdb..0b41879 100644 (file)
--- a/lustre/include/lustre_quota.h
+++ b/lustre/include/lustre_quota.h
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
  */
 
@@ -32,8 +32,9 @@
  *
  */
 
-#include <linux/lustre_quota.h>
-
+#include <linux/fs.h>
+#include <linux/quota.h>
+#include <linux/quotaops.h>
 #include <dt_object.h>
 #include <lustre_fid.h>
 #include <lustre_dlm.h>
@@ -178,10 +179,6 @@ void qsd_op_end(const struct lu_env *, struct qsd_instance *,
                struct lquota_trans *);
 void qsd_op_adjust(const struct lu_env *, struct qsd_instance *,
                   union lquota_id *, int);
-/* This is exported for the ldiskfs quota migration only,
- * see convert_quota_file() */
-int lquota_disk_write_glb(const struct lu_env *, struct dt_object *,
-                         __u64, struct lquota_glb_rec *);
 
 /*
  * Quota information attached to a transaction
@@ -226,6 +223,7 @@ struct lquota_trans {
 #define QUOTA_FL_OVER_USRQUOTA  0x01
 #define QUOTA_FL_OVER_GRPQUOTA  0x02
 #define QUOTA_FL_SYNC           0x04
+#define QUOTA_FL_OVER_PRJQUOTA  0x08
 
 #define IS_LQUOTA_RES(res)                                             \
        (res->lr_name.name[LUSTRE_RES_ID_SEQ_OFF] == FID_SEQ_QUOTA ||   \