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-8019 llite: Restore proper opencache operations
[fs/lustre-release.git]
/
lustre
/
llite
/
vvp_dev.c
diff --git
a/lustre/llite/vvp_dev.c
b/lustre/llite/vvp_dev.c
index
288b642
..
61b8bb9
100644
(file)
--- a/
lustre/llite/vvp_dev.c
+++ b/
lustre/llite/vvp_dev.c
@@
-27,7
+27,7
@@
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
4
, Intel Corporation.
+ * Copyright (c) 2012, 201
5
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-59,7
+59,6
@@
static struct kmem_cache *ll_thread_kmem;
struct kmem_cache *vvp_lock_kmem;
struct kmem_cache *vvp_object_kmem;
static struct kmem_cache *ll_thread_kmem;
struct kmem_cache *vvp_lock_kmem;
struct kmem_cache *vvp_object_kmem;
-struct kmem_cache *vvp_req_kmem;
static struct kmem_cache *vvp_session_kmem;
static struct kmem_cache *vvp_thread_kmem;
static struct kmem_cache *vvp_session_kmem;
static struct kmem_cache *vvp_thread_kmem;
@@
-79,11
+78,6
@@
static struct lu_kmem_descr vvp_caches[] = {
.ckd_name = "vvp_object_kmem",
.ckd_size = sizeof(struct vvp_object),
},
.ckd_name = "vvp_object_kmem",
.ckd_size = sizeof(struct vvp_object),
},
- {
- .ckd_cache = &vvp_req_kmem,
- .ckd_name = "vvp_req_kmem",
- .ckd_size = sizeof(struct vvp_req),
- },
{
.ckd_cache = &vvp_session_kmem,
.ckd_name = "vvp_session_kmem",
{
.ckd_cache = &vvp_session_kmem,
.ckd_name = "vvp_session_kmem",
@@
-180,10
+174,6
@@
static const struct lu_device_operations vvp_lu_ops = {
.ldo_object_alloc = vvp_object_alloc
};
.ldo_object_alloc = vvp_object_alloc
};
-static const struct cl_device_operations vvp_cl_ops = {
- .cdo_req_init = vvp_req_init,
-};
-
static struct lu_device *vvp_device_free(const struct lu_env *env,
struct lu_device *d)
{
static struct lu_device *vvp_device_free(const struct lu_env *env,
struct lu_device *d)
{
@@
-218,7
+208,6
@@
static struct lu_device *vvp_device_alloc(const struct lu_env *env,
lud = &vdv->vdv_cl.cd_lu_dev;
cl_device_init(&vdv->vdv_cl, t);
vvp2lu_dev(vdv)->ld_ops = &vvp_lu_ops;
lud = &vdv->vdv_cl.cd_lu_dev;
cl_device_init(&vdv->vdv_cl, t);
vvp2lu_dev(vdv)->ld_ops = &vvp_lu_ops;
- vdv->vdv_cl.cd_ops = &vvp_cl_ops;
OBD_ALLOC_PTR(site);
if (site != NULL) {
OBD_ALLOC_PTR(site);
if (site != NULL) {
@@
-328,7
+317,7
@@
int cl_sb_init(struct super_block *sb)
struct cl_device *cl;
struct lu_env *env;
int rc = 0;
struct cl_device *cl;
struct lu_env *env;
int rc = 0;
-
int
refcheck;
+
__u16
refcheck;
sbi = ll_s2sbi(sb);
env = cl_env_get(&refcheck);
sbi = ll_s2sbi(sb);
env = cl_env_get(&refcheck);
@@
-336,7
+325,6
@@
int cl_sb_init(struct super_block *sb)
cl = cl_type_setup(env, NULL, &vvp_device_type,
sbi->ll_dt_exp->exp_obd->obd_lu_dev);
if (!IS_ERR(cl)) {
cl = cl_type_setup(env, NULL, &vvp_device_type,
sbi->ll_dt_exp->exp_obd->obd_lu_dev);
if (!IS_ERR(cl)) {
- cl2vvp_dev(cl)->vdv_sb = sb;
sbi->ll_cl = cl;
sbi->ll_site = cl2lu_dev(cl)->ld_site;
}
sbi->ll_cl = cl;
sbi->ll_site = cl2lu_dev(cl)->ld_site;
}
@@
-351,7
+339,7
@@
int cl_sb_fini(struct super_block *sb)
struct ll_sb_info *sbi;
struct lu_env *env;
struct cl_device *cld;
struct ll_sb_info *sbi;
struct lu_env *env;
struct cl_device *cld;
-
int
refcheck;
+
__u16
refcheck;
int result;
ENTRY;
int result;
ENTRY;
@@
-553,7
+541,7
@@
static int vvp_pgcache_show(struct seq_file *f, void *v)
struct cl_object *clob;
struct lu_env *env;
struct vvp_pgcache_id id;
struct cl_object *clob;
struct lu_env *env;
struct vvp_pgcache_id id;
-
int
refcheck;
+
__u16
refcheck;
int result;
env = cl_env_get(&refcheck);
int result;
env = cl_env_get(&refcheck);
@@
-599,7
+587,7
@@
static void *vvp_pgcache_start(struct seq_file *f, loff_t *pos)
{
struct ll_sb_info *sbi;
struct lu_env *env;
{
struct ll_sb_info *sbi;
struct lu_env *env;
-
int
refcheck;
+
__u16
refcheck;
sbi = f->private;
sbi = f->private;
@@
-623,7
+611,7
@@
static void *vvp_pgcache_next(struct seq_file *f, void *v, loff_t *pos)
{
struct ll_sb_info *sbi;
struct lu_env *env;
{
struct ll_sb_info *sbi;
struct lu_env *env;
-
int
refcheck;
+
__u16
refcheck;
env = cl_env_get(&refcheck);
if (!IS_ERR(env)) {
env = cl_env_get(&refcheck);
if (!IS_ERR(env)) {