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-6215 kernel: use f_path for inode dentry
[fs/lustre-release.git]
/
lustre
/
quota
/
lquota_lib.c
diff --git
a/lustre/quota/lquota_lib.c
b/lustre/quota/lquota_lib.c
index
9d51049
..
1051d27
100644
(file)
--- a/
lustre/quota/lquota_lib.c
+++ b/
lustre/quota/lquota_lib.c
@@
-21,17
+21,13
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright (c) 201
1, 2012, Intel, Inc
.
+ * Copyright (c) 201
2, 2014, Intel Corporation
.
* Use is subject to license terms.
*
* Author: Johann Lombardi <johann.lombardi@intel.com>
* Author: Niu Yawei <yawei.niu@intel.com>
*/
* Use is subject to license terms.
*
* Author: Johann Lombardi <johann.lombardi@intel.com>
* Author: Niu Yawei <yawei.niu@intel.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
#define DEBUG_SUBSYSTEM S_LQUOTA
#include <linux/version.h>
#define DEBUG_SUBSYSTEM S_LQUOTA
#include <linux/version.h>
@@
-40,6
+36,19
@@
#include "lquota_internal.h"
#include "lquota_internal.h"
+struct kmem_cache *lqe_kmem;
+
+struct lu_kmem_descr lquota_caches[] = {
+ {
+ .ckd_cache = &lqe_kmem,
+ .ckd_name = "lqe_kmem",
+ .ckd_size = sizeof(struct lquota_entry)
+ },
+ {
+ .ckd_cache = NULL
+ }
+};
+
/* register lquota key */
LU_KEY_INIT_FINI(lquota, struct lquota_thread_info);
LU_CONTEXT_KEY_DEFINE(lquota, LCT_MD_THREAD | LCT_DT_THREAD | LCT_LOCAL);
/* register lquota key */
LU_KEY_INIT_FINI(lquota, struct lquota_thread_info);
LU_CONTEXT_KEY_DEFINE(lquota, LCT_MD_THREAD | LCT_DT_THREAD | LCT_LOCAL);
@@
-181,7
+190,7
@@
int lquotactl_slv(const struct lu_env *env, struct dt_device *dev,
/* lookup record storing space accounting information for this ID */
rc = dt_lookup(env, obj, (struct dt_rec *)&qti->qti_acct_rec,
/* lookup record storing space accounting information for this ID */
rc = dt_lookup(env, obj, (struct dt_rec *)&qti->qti_acct_rec,
- (struct dt_key *)&key
, BYPASS_CAPA
);
+ (struct dt_key *)&key);
if (rc < 0)
GOTO(out, rc);
if (rc < 0)
GOTO(out, rc);
@@
-203,7
+212,7
@@
int lquotactl_slv(const struct lu_env *env, struct dt_device *dev,
memset(&qti->qti_slv_rec, 0, sizeof(qti->qti_slv_rec));
/* lookup record storing enforcement information for this ID */
rc = dt_lookup(env, obj, (struct dt_rec *)&qti->qti_slv_rec,
memset(&qti->qti_slv_rec, 0, sizeof(qti->qti_slv_rec));
/* lookup record storing enforcement information for this ID */
rc = dt_lookup(env, obj, (struct dt_rec *)&qti->qti_slv_rec,
- (struct dt_key *)&key
, BYPASS_CAPA
);
+ (struct dt_key *)&key);
if (rc < 0 && rc != -ENOENT)
GOTO(out, rc = 0);
if (rc < 0 && rc != -ENOENT)
GOTO(out, rc = 0);
@@
-244,7
+253,7
@@
void lquota_generate_fid(struct lu_fid *fid, int pool_id, int pool_type,
* Helper routine used to extract pool ID, pool type and quota type from a
* given FID.
*/
* Helper routine used to extract pool ID, pool type and quota type from a
* given FID.
*/
-int lquota_extract_fid(struct lu_fid *fid, int *pool_id, int *pool_type,
+int lquota_extract_fid(
const
struct lu_fid *fid, int *pool_id, int *pool_type,
int *quota_type)
{
unsigned int tmp;
int *quota_type)
{
unsigned int tmp;
@@
-280,7
+289,7
@@
int lquota_extract_fid(struct lu_fid *fid, int *pool_id, int *pool_type,
RETURN(0);
}
RETURN(0);
}
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,
7,50,
0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,
7, 56,
0)
/* Index features supported by the global index objects.
* We actually use one dt_index_features structure for each quota combination
* of quota type x [inode, block] to allow the ldiskfs OSD to recognize those
/* Index features supported by the global index objects.
* We actually use one dt_index_features structure for each quota combination
* of quota type x [inode, block] to allow the ldiskfs OSD to recognize those
@@
-319,43
+328,56
@@
const struct dt_index_features *glb_idx_feature(struct lu_fid *fid)
return &dt_quota_bgrp_features;
}
}
return &dt_quota_bgrp_features;
}
}
-#else
-#warning "remove old quota compatibility code"
-#endif
+#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 56, 0) */
static int __init init_lquota(void)
{
int rc;
static int __init init_lquota(void)
{
int rc;
+ ENTRY;
- /* call old quota module init function */
- rc = init_lustre_quota();
- if (rc)
- return rc;
-
- /* new quota initialization */
lquota_key_init_generic(&lquota_thread_key, NULL);
lu_context_key_register(&lquota_thread_key);
lquota_key_init_generic(&lquota_thread_key, NULL);
lu_context_key_register(&lquota_thread_key);
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,
7,50,
0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,
7, 56,
0)
dt_quota_iusr_features = dt_quota_busr_features = dt_quota_glb_features;
dt_quota_igrp_features = dt_quota_bgrp_features = dt_quota_glb_features;
dt_quota_iusr_features = dt_quota_busr_features = dt_quota_glb_features;
dt_quota_igrp_features = dt_quota_bgrp_features = dt_quota_glb_features;
-#else
-#warning "remove old quota compatibility code"
#endif
#endif
- return 0;
+ rc = lu_kmem_init(lquota_caches);
+ if (rc)
+ GOTO(out_key, rc);
+
+ rc = qmt_glb_init();
+ if (rc)
+ GOTO(out_caches, rc);
+
+ rc = qsd_glb_init();
+ if (rc)
+ GOTO(out_qmt, rc);
+
+ RETURN(0);
+
+out_qmt:
+ qmt_glb_fini();
+out_caches:
+ lu_kmem_fini(lquota_caches);
+out_key:
+ lu_context_key_degister(&lquota_thread_key);
+ return rc;
}
static void exit_lquota(void)
{
}
static void exit_lquota(void)
{
- /* call old quota module exit function */
-
exit_lustre_quota
();
-
+ qsd_glb_fini();
+
qmt_glb_fini
();
+ lu_kmem_fini(lquota_caches);
lu_context_key_degister(&lquota_thread_key);
}
lu_context_key_degister(&lquota_thread_key);
}
-MODULE_AUTHOR("Intel
, Inc.
<http://www.intel.com/>");
+MODULE_AUTHOR("Intel
Corporation
<http://www.intel.com/>");
MODULE_DESCRIPTION("Lustre Quota");
MODULE_DESCRIPTION("Lustre Quota");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");
-cfs_module(lquota, "2.4.0", init_lquota, exit_lquota);
+module_init(init_lquota);
+module_exit(exit_lquota);