Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4444 test: Re-enable conf-sanity/69 for ZFS
[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
..
2bb8c20
100644
(file)
--- a/
lustre/include/lustre_quota.h
+++ b/
lustre/include/lustre_quota.h
@@
-21,7
+21,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012,
2014,
Intel Corporation.
* Use is subject to license terms.
*/
* 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>
#include <dt_object.h>
#include <lustre_fid.h>
#include <lustre_dlm.h>
@@
-46,6
+47,10
@@
#define MAX_DQ_TIME 604800 /* (7*24*60*60) 1 week */
#endif
#define MAX_DQ_TIME 604800 /* (7*24*60*60) 1 week */
#endif
+#ifndef LL_MAXQUOTAS
+#define LL_MAXQUOTAS 2
+#endif
+
struct lquota_id_info;
struct lquota_trans;
struct lquota_id_info;
struct lquota_trans;
@@
-178,10
+183,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);
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
/*
* Quota information attached to a transaction