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
b=24037 Using cfs_curproc_umask() instead of reference directly.
[fs/lustre-release.git]
/
lustre
/
lmv
/
lmv_internal.h
diff --git
a/lustre/lmv/lmv_internal.h
b/lustre/lmv/lmv_internal.h
index
818d53d
..
dda0a68
100644
(file)
--- a/
lustre/lmv/lmv_internal.h
+++ b/
lustre/lmv/lmv_internal.h
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-42,22
+42,22
@@
#define LMV_MAX_TGT_COUNT 128
#define LMV_MAX_TGT_COUNT 128
-#define lmv_init_lock(lmv) down(&lmv->init_sem);
-#define lmv_init_unlock(lmv) up(&lmv->init_sem);
+#define lmv_init_lock(lmv)
cfs_
down(&lmv->init_sem);
+#define lmv_init_unlock(lmv)
cfs_
up(&lmv->init_sem);
#define LL_IT2STR(it) \
((it) ? ldlm_it2str((it)->it_op) : "0")
struct lmv_stripe {
#define LL_IT2STR(it) \
((it) ? ldlm_it2str((it)->it_op) : "0")
struct lmv_stripe {
- /**
- * Dir stripe fid.
+ /**
+ * Dir stripe fid.
*/
struct lu_fid ls_fid;
*/
struct lu_fid ls_fid;
- /**
- * Cached home mds number for
@li_fid.
+ /**
+ * Cached home mds number for
\a li_fid.
*/
mdsno_t ls_mds;
*/
mdsno_t ls_mds;
- /**
+ /**
* Stripe object size.
*/
unsigned long ls_size;
* Stripe object size.
*/
unsigned long ls_size;
@@
-73,20
+73,20
@@
struct lmv_object {
/**
* Link to global objects list.
*/
/**
* Link to global objects list.
*/
-
struct list_head
lo_list;
+
cfs_list_t
lo_list;
/**
* Sema for protecting fields.
*/
/**
* Sema for protecting fields.
*/
-
struct semaphore
lo_guard;
- /**
+
cfs_semaphore_t
lo_guard;
+ /**
* Object state like O_FREEING.
*/
int lo_state;
* Object state like O_FREEING.
*/
int lo_state;
- /**
- * Object ref counter.
+ /**
+ * Object ref counter.
*/
*/
-
atomic_t
lo_count;
- /**
+
cfs_atomic_t
lo_count;
+ /**
* Object master fid.
*/
struct lu_fid lo_fid;
* Object master fid.
*/
struct lu_fid lo_fid;
@@
-94,15
+94,15
@@
struct lmv_object {
* Object hash type to find stripe by name.
*/
__u32 lo_hashtype;
* Object hash type to find stripe by name.
*/
__u32 lo_hashtype;
- /**
- * Number of stripes.
+ /**
+ * Number of stripes.
*/
int lo_objcount;
*/
int lo_objcount;
- /**
- * Array of sub-objs.
+ /**
+ * Array of sub-objs.
*/
struct lmv_stripe *lo_stripes;
*/
struct lmv_stripe *lo_stripes;
- /**
+ /**
* Pointer to LMV obd.
*/
struct obd_device *lo_obd;
* Pointer to LMV obd.
*/
struct obd_device *lo_obd;
@@
-115,14
+115,14
@@
static inline void
lmv_object_lock(struct lmv_object *obj)
{
LASSERT(obj);
lmv_object_lock(struct lmv_object *obj)
{
LASSERT(obj);
- down(&obj->lo_guard);
+
cfs_
down(&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);
- up(&obj->lo_guard);
+
cfs_
up(&obj->lo_guard);
}
void lmv_object_add(struct lmv_object *obj);
}
void lmv_object_add(struct lmv_object *obj);
@@
-233,7
+233,7
@@
lmv_find_target(struct lmv_obd *lmv, const struct lu_fid *fid)
{
mdsno_t mds;
int rc;
{
mdsno_t mds;
int rc;
-
+
rc = lmv_fld_lookup(lmv, fid, &mds);
if (rc)
return ERR_PTR(rc);
rc = lmv_fld_lookup(lmv, fid, &mds);
if (rc)
return ERR_PTR(rc);