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
new tag 2.2.58
[fs/lustre-release.git]
/
lustre
/
lmv
/
lmv_internal.h
diff --git
a/lustre/lmv/lmv_internal.h
b/lustre/lmv/lmv_internal.h
index
a2c67ad
..
e391d0b
100644
(file)
--- a/
lustre/lmv/lmv_internal.h
+++ b/
lustre/lmv/lmv_internal.h
@@
-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,9
+26,8
@@
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
- */
-/*
- * Copyright (c) 2011 Whamcloud, Inc.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-45,8
+42,8
@@
#define LMV_MAX_TGT_COUNT 128
#define LMV_MAX_TGT_COUNT 128
-#define lmv_init_lock(lmv) cfs_
down(&lmv->init_sem
);
-#define lmv_init_unlock(lmv) cfs_
up(&lmv->init_sem
);
+#define lmv_init_lock(lmv) cfs_
mutex_lock(&lmv->init_mutex
);
+#define lmv_init_unlock(lmv) cfs_
mutex_unlock(&lmv->init_mutex
);
#define LL_IT2STR(it) \
((it) ? ldlm_it2str((it)->it_op) : "0")
#define LL_IT2STR(it) \
((it) ? ldlm_it2str((it)->it_op) : "0")
@@
-80,7
+77,7
@@
struct lmv_object {
/**
* Sema for protecting fields.
*/
/**
* Sema for protecting fields.
*/
- cfs_
semaphore_t
lo_guard;
+ cfs_
mutex_t
lo_guard;
/**
* Object state like O_FREEING.
*/
/**
* Object state like O_FREEING.
*/
@@
-118,14
+115,14
@@
static inline void
lmv_object_lock(struct lmv_object *obj)
{
LASSERT(obj);
lmv_object_lock(struct lmv_object *obj)
{
LASSERT(obj);
- cfs_
down
(&obj->lo_guard);
+ cfs_
mutex_lock
(&obj->lo_guard);
}
static inline void
lmv_object_unlock(struct lmv_object *obj)
{
LASSERT(obj);
}
static inline void
lmv_object_unlock(struct lmv_object *obj)
{
LASSERT(obj);
- cfs_
up
(&obj->lo_guard);
+ cfs_
mutex_unlock
(&obj->lo_guard);
}
void lmv_object_add(struct lmv_object *obj);
}
void lmv_object_add(struct lmv_object *obj);