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-744 clio: save memory allocations for cl_page
[fs/lustre-release.git]
/
lustre
/
lov
/
lovsub_object.c
diff --git
a/lustre/lov/lovsub_object.c
b/lustre/lov/lovsub_object.c
index
7793074
..
536039d
100644
(file)
--- a/
lustre/lov/lovsub_object.c
+++ b/
lustre/lov/lovsub_object.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.
@@
-28,6
+26,8
@@
/*
* 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, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-66,6
+66,7
@@
int lovsub_object_init(const struct lu_env *env, struct lu_object *obj,
below = under->ld_ops->ldo_object_alloc(env, obj->lo_header, under);
if (below != NULL) {
lu_object_add(obj, below);
below = under->ld_ops->ldo_object_alloc(env, obj->lo_header, under);
if (below != NULL) {
lu_object_add(obj, below);
+ cl_object_page_init(lu2cl(obj), sizeof(struct lovsub_page));
result = 0;
} else
result = -ENOMEM;
result = 0;
} else
result = -ENOMEM;
@@
-85,9
+86,9
@@
static void lovsub_object_free(const struct lu_env *env, struct lu_object *obj)
if (lov) {
LASSERT(lov->lo_type == LLT_RAID0);
LASSERT(lov->u.raid0.lo_sub[los->lso_index] == los);
if (lov) {
LASSERT(lov->lo_type == LLT_RAID0);
LASSERT(lov->u.raid0.lo_sub[los->lso_index] == los);
-
cfs_
spin_lock(&lov->u.raid0.lo_sub_lock);
-
lov->u.raid0.lo_sub[los->lso_index] = NULL;
-
cfs_
spin_unlock(&lov->u.raid0.lo_sub_lock);
+ spin_lock(&lov->u.raid0.lo_sub_lock);
+ lov->u.raid0.lo_sub[los->lso_index] = NULL;
+ spin_unlock(&lov->u.raid0.lo_sub_lock);
}
lu_object_fini(obj);
}
lu_object_fini(obj);
@@
-101,7
+102,7
@@
static int lovsub_object_print(const struct lu_env *env, void *cookie,
{
struct lovsub_object *los = lu2lovsub(obj);
{
struct lovsub_object *los = lu2lovsub(obj);
- return (*p)(env, cookie, "[%
i
]", los->lso_index);
+ return (*p)(env, cookie, "[%
d
]", los->lso_index);
}
static int lovsub_attr_set(const struct lu_env *env, struct cl_object *obj,
}
static int lovsub_attr_set(const struct lu_env *env, struct cl_object *obj,