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-13219 tests: add nfs-server service in setup-nfs.sh
[fs/lustre-release.git]
/
lustre
/
osc
/
osc_dev.c
diff --git
a/lustre/osc/osc_dev.c
b/lustre/osc/osc_dev.c
index
c06a5de
..
68d8a17
100644
(file)
--- a/
lustre/osc/osc_dev.c
+++ b/
lustre/osc/osc_dev.c
@@
-23,7
+23,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
5
, Intel Corporation.
+ * Copyright (c) 2012, 201
7
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-38,19
+38,25
@@
/* class_name2obd() */
#include <obd_class.h>
/* class_name2obd() */
#include <obd_class.h>
+#include <lustre_osc.h>
+#include <uapi/linux/lustre/lustre_param.h>
-#include "osc_
cl_
internal.h"
+#include "osc_internal.h"
-/** \addtogroup osc
- * @{
+/** \addtogroup osc
+ * @{
*/
struct kmem_cache *osc_lock_kmem;
*/
struct kmem_cache *osc_lock_kmem;
+EXPORT_SYMBOL(osc_lock_kmem);
struct kmem_cache *osc_object_kmem;
struct kmem_cache *osc_object_kmem;
+EXPORT_SYMBOL(osc_object_kmem);
+
struct kmem_cache *osc_thread_kmem;
struct kmem_cache *osc_session_kmem;
struct kmem_cache *osc_extent_kmem;
struct kmem_cache *osc_quota_kmem;
struct kmem_cache *osc_thread_kmem;
struct kmem_cache *osc_session_kmem;
struct kmem_cache *osc_extent_kmem;
struct kmem_cache *osc_quota_kmem;
+struct kmem_cache *osc_obdo_kmem;
struct lu_kmem_descr osc_caches[] = {
{
struct lu_kmem_descr osc_caches[] = {
{
@@
-84,23
+90,17
@@
struct lu_kmem_descr osc_caches[] = {
.ckd_size = sizeof(struct osc_quota_info)
},
{
.ckd_size = sizeof(struct osc_quota_info)
},
{
- .ckd_cache = NULL
- }
+ .ckd_cache = &osc_obdo_kmem,
+ .ckd_name = "osc_obdo_kmem",
+ .ckd_size = sizeof(struct obdo)
+ },
+ {
+ .ckd_cache = NULL
+ }
};
/*****************************************************************************
*
};
/*****************************************************************************
*
- * Type conversions.
- *
- */
-
-static struct lu_device *osc2lu_dev(struct osc_device *osc)
-{
- return &osc->od_cl.cd_lu_dev;
-}
-
-/*****************************************************************************
- *
* Osc device and device type functions.
*
*/
* Osc device and device type functions.
*
*/
@@
-130,6
+130,7
@@
struct lu_context_key osc_key = {
.lct_init = osc_key_init,
.lct_fini = osc_key_fini
};
.lct_init = osc_key_init,
.lct_fini = osc_key_fini
};
+EXPORT_SYMBOL(osc_key);
static void *osc_session_init(const struct lu_context *ctx,
struct lu_context_key *key)
static void *osc_session_init(const struct lu_context *ctx,
struct lu_context_key *key)
@@
-154,44
+155,49
@@
struct lu_context_key osc_session_key = {
.lct_init = osc_session_init,
.lct_fini = osc_session_fini
};
.lct_init = osc_session_init,
.lct_fini = osc_session_fini
};
+EXPORT_SYMBOL(osc_session_key);
/* type constructor/destructor: osc_type_{init,fini,start,stop}(). */
LU_TYPE_INIT_FINI(osc, &osc_key, &osc_session_key);
/* type constructor/destructor: osc_type_{init,fini,start,stop}(). */
LU_TYPE_INIT_FINI(osc, &osc_key, &osc_session_key);
-static int osc_
cl_process_config(const struct lu_env *env
,
-
struct lu_device *d,
struct lustre_cfg *cfg)
+static int osc_
process_config(const struct lu_env *env, struct lu_device *d
,
+ struct lustre_cfg *cfg)
{
{
- ENTRY;
- RETURN(osc_process_config_base(d->ld_obd, cfg));
+ ssize_t count = class_modify_config(cfg, PARAM_OSC,
+ &d->ld_obd->obd_kset.kobj);
+ return count > 0 ? 0 : count;
}
static const struct lu_device_operations osc_lu_ops = {
.ldo_object_alloc = osc_object_alloc,
}
static const struct lu_device_operations osc_lu_ops = {
.ldo_object_alloc = osc_object_alloc,
-
.ldo_process_config = osc_cl
_process_config,
+
.ldo_process_config = osc
_process_config,
.ldo_recovery_complete = NULL
};
.ldo_recovery_complete = NULL
};
-
static
int osc_device_init(const struct lu_env *env, struct lu_device *d,
-
const char *name, struct lu_device *next)
+int osc_device_init(const struct lu_env *env, struct lu_device *d,
+ const char *name, struct lu_device *next)
{
RETURN(0);
}
{
RETURN(0);
}
+EXPORT_SYMBOL(osc_device_init);
-st
atic st
ruct lu_device *osc_device_fini(const struct lu_env *env,
-
struct lu_device *d)
+struct lu_device *osc_device_fini(const struct lu_env *env,
+ struct lu_device *d)
{
return NULL;
}
{
return NULL;
}
+EXPORT_SYMBOL(osc_device_fini);
-st
atic st
ruct lu_device *osc_device_free(const struct lu_env *env,
-
struct lu_device *d)
+struct lu_device *osc_device_free(const struct lu_env *env,
+ struct lu_device *d)
{
{
-
struct osc_device *od = lu2osc_dev(d);
+ struct osc_device *od = lu2osc_dev(d);
-
cl_device_fini(lu2cl_dev(d));
-
OBD_FREE_PTR(od);
-
return NULL;
+ cl_device_fini(lu2cl_dev(d));
+ OBD_FREE_PTR(od);
+ return NULL;
}
}
+EXPORT_SYMBOL(osc_device_free);
static struct lu_device *osc_device_alloc(const struct lu_env *env,
struct lu_device_type *t,
static struct lu_device *osc_device_alloc(const struct lu_env *env,
struct lu_device_type *t,