* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Implementation of cl_object for OSC layer.
*
* Author: Nikita Danilov <nikita.danilov@sun.com>
+ * Author: Jinshan Xiong <jinshan.xiong@intel.com>
*/
#define DEBUG_SUBSYSTEM S_OSC
int i;
osc->oo_oinfo = cconf->u.coc_oinfo;
-#ifdef INVARIANT_CHECK
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
mutex_init(&osc->oo_debug_mutex);
#endif
spin_lock_init(&osc->oo_seatbelt);
for (i = 0; i < CRT_NR; ++i)
- CFS_INIT_LIST_HEAD(&osc->oo_inflight[i]);
+ INIT_LIST_HEAD(&osc->oo_inflight[i]);
- CFS_INIT_LIST_HEAD(&osc->oo_ready_item);
- CFS_INIT_LIST_HEAD(&osc->oo_hp_ready_item);
- CFS_INIT_LIST_HEAD(&osc->oo_write_item);
- CFS_INIT_LIST_HEAD(&osc->oo_read_item);
+ INIT_LIST_HEAD(&osc->oo_ready_item);
+ INIT_LIST_HEAD(&osc->oo_hp_ready_item);
+ INIT_LIST_HEAD(&osc->oo_write_item);
+ INIT_LIST_HEAD(&osc->oo_read_item);
osc->oo_root.rb_node = NULL;
- CFS_INIT_LIST_HEAD(&osc->oo_hp_exts);
- CFS_INIT_LIST_HEAD(&osc->oo_urgent_exts);
- CFS_INIT_LIST_HEAD(&osc->oo_rpc_exts);
- CFS_INIT_LIST_HEAD(&osc->oo_reading_exts);
- cfs_atomic_set(&osc->oo_nr_reads, 0);
- cfs_atomic_set(&osc->oo_nr_writes, 0);
+ INIT_LIST_HEAD(&osc->oo_hp_exts);
+ INIT_LIST_HEAD(&osc->oo_urgent_exts);
+ INIT_LIST_HEAD(&osc->oo_rpc_exts);
+ INIT_LIST_HEAD(&osc->oo_reading_exts);
+ atomic_set(&osc->oo_nr_reads, 0);
+ atomic_set(&osc->oo_nr_writes, 0);
spin_lock_init(&osc->oo_lock);
+ spin_lock_init(&osc->oo_tree_lock);
cl_object_page_init(lu2cl(obj), sizeof(struct osc_page));
int i;
for (i = 0; i < CRT_NR; ++i)
- LASSERT(cfs_list_empty(&osc->oo_inflight[i]));
+ LASSERT(list_empty(&osc->oo_inflight[i]));
- LASSERT(cfs_list_empty(&osc->oo_ready_item));
- LASSERT(cfs_list_empty(&osc->oo_hp_ready_item));
- LASSERT(cfs_list_empty(&osc->oo_write_item));
- LASSERT(cfs_list_empty(&osc->oo_read_item));
+ LASSERT(list_empty(&osc->oo_ready_item));
+ LASSERT(list_empty(&osc->oo_hp_ready_item));
+ LASSERT(list_empty(&osc->oo_write_item));
+ LASSERT(list_empty(&osc->oo_read_item));
LASSERT(osc->oo_root.rb_node == NULL);
- LASSERT(cfs_list_empty(&osc->oo_hp_exts));
- LASSERT(cfs_list_empty(&osc->oo_urgent_exts));
- LASSERT(cfs_list_empty(&osc->oo_rpc_exts));
- LASSERT(cfs_list_empty(&osc->oo_reading_exts));
- LASSERT(cfs_atomic_read(&osc->oo_nr_reads) == 0);
- LASSERT(cfs_atomic_read(&osc->oo_nr_writes) == 0);
+ LASSERT(list_empty(&osc->oo_hp_exts));
+ LASSERT(list_empty(&osc->oo_urgent_exts));
+ LASSERT(list_empty(&osc->oo_rpc_exts));
+ LASSERT(list_empty(&osc->oo_reading_exts));
+ LASSERT(atomic_read(&osc->oo_nr_reads) == 0);
+ LASSERT(atomic_read(&osc->oo_nr_writes) == 0);
lu_object_fini(obj);
OBD_SLAB_FREE_PTR(osc, osc_object_kmem);
};
struct lu_object *osc_object_alloc(const struct lu_env *env,
- const struct lu_object_header *unused,
- struct lu_device *dev)
+ const struct lu_object_header *unused,
+ struct lu_device *dev)
{
- struct osc_object *osc;
- struct lu_object *obj;
-
- OBD_SLAB_ALLOC_PTR_GFP(osc, osc_object_kmem, CFS_ALLOC_IO);
- if (osc != NULL) {
- obj = osc2lu(osc);
- lu_object_init(obj, NULL, dev);
- osc->oo_cl.co_ops = &osc_ops;
- obj->lo_ops = &osc_lu_obj_ops;
- } else
- obj = NULL;
- return obj;
+ struct osc_object *osc;
+ struct lu_object *obj;
+
+ OBD_SLAB_ALLOC_PTR_GFP(osc, osc_object_kmem, GFP_NOFS);
+ if (osc != NULL) {
+ obj = osc2lu(osc);
+ lu_object_init(obj, NULL, dev);
+ osc->oo_cl.co_ops = &osc_ops;
+ obj->lo_ops = &osc_lu_obj_ops;
+ } else
+ obj = NULL;
+ return obj;
}
/** @} osc */