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-1131 osd-ldiskfs: better journal credit tracking
[fs/lustre-release.git]
/
lustre
/
osc
/
osc_dev.c
diff --git
a/lustre/osc/osc_dev.c
b/lustre/osc/osc_dev.c
index
068f0d5
..
fc3a47f
100644
(file)
--- a/
lustre/osc/osc_dev.c
+++ b/
lustre/osc/osc_dev.c
@@
-1,6
+1,4
@@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-26,7
+24,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc.
All rights reserved.
+ * Copyright
(c) 2008, 2010, Oracle and/or its affiliates.
All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-38,8
+36,6
@@
* Author: Nikita Danilov <nikita.danilov@sun.com>
*/
* Author: Nikita Danilov <nikita.danilov@sun.com>
*/
-/** \addtogroup osc osc @{ */
-
#define DEBUG_SUBSYSTEM S_OSC
/* class_name2obd() */
#define DEBUG_SUBSYSTEM S_OSC
/* class_name2obd() */
@@
-47,12
+43,18
@@
#include "osc_cl_internal.h"
#include "osc_cl_internal.h"
+/** \addtogroup osc
+ * @{
+ */
+
cfs_mem_cache_t *osc_page_kmem;
cfs_mem_cache_t *osc_lock_kmem;
cfs_mem_cache_t *osc_object_kmem;
cfs_mem_cache_t *osc_thread_kmem;
cfs_mem_cache_t *osc_session_kmem;
cfs_mem_cache_t *osc_req_kmem;
cfs_mem_cache_t *osc_page_kmem;
cfs_mem_cache_t *osc_lock_kmem;
cfs_mem_cache_t *osc_object_kmem;
cfs_mem_cache_t *osc_thread_kmem;
cfs_mem_cache_t *osc_session_kmem;
cfs_mem_cache_t *osc_req_kmem;
+cfs_mem_cache_t *osc_extent_kmem;
+cfs_mem_cache_t *osc_quota_kmem;
struct lu_kmem_descr osc_caches[] = {
{
struct lu_kmem_descr osc_caches[] = {
{
@@
-86,11
+88,21
@@
struct lu_kmem_descr osc_caches[] = {
.ckd_size = sizeof (struct osc_req)
},
{
.ckd_size = sizeof (struct osc_req)
},
{
+ .ckd_cache = &osc_extent_kmem,
+ .ckd_name = "osc_extent_kmem",
+ .ckd_size = sizeof (struct osc_extent)
+ },
+ {
+ .ckd_cache = &osc_quota_kmem,
+ .ckd_name = "osc_quota_kmem",
+ .ckd_size = sizeof(struct osc_quota_info)
+ },
+ {
.ckd_cache = NULL
}
};
.ckd_cache = NULL
}
};
-
struct lock_class_key
osc_ast_guard_class;
+
cfs_lock_class_key_t
osc_ast_guard_class;
/*****************************************************************************
*
/*****************************************************************************
*