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-1346 libcfs: cleanup libcfs primitive (linux-prim.h)
[fs/lustre-release.git]
/
lustre
/
lov
/
lov_object.c
diff --git
a/lustre/lov/lov_object.c
b/lustre/lov/lov_object.c
index
230f9d6
..
ae80756
100644
(file)
--- a/
lustre/lov/lov_object.c
+++ b/
lustre/lov/lov_object.c
@@
-587,13
+587,13
@@
enum lov_layout_type lov_type(struct lov_stripe_md *lsm)
static inline void lov_conf_freeze(struct lov_object *lov)
{
static inline void lov_conf_freeze(struct lov_object *lov)
{
- if (lov->lo_owner != c
fs_current()
)
+ if (lov->lo_owner != c
urrent
)
down_read(&lov->lo_type_guard);
}
static inline void lov_conf_thaw(struct lov_object *lov)
{
down_read(&lov->lo_type_guard);
}
static inline void lov_conf_thaw(struct lov_object *lov)
{
- if (lov->lo_owner != c
fs_current()
)
+ if (lov->lo_owner != c
urrent
)
up_read(&lov->lo_type_guard);
}
up_read(&lov->lo_type_guard);
}
@@
-631,10
+631,10
@@
do { \
static void lov_conf_lock(struct lov_object *lov)
{
static void lov_conf_lock(struct lov_object *lov)
{
- LASSERT(lov->lo_owner != c
fs_current()
);
+ LASSERT(lov->lo_owner != c
urrent
);
down_write(&lov->lo_type_guard);
LASSERT(lov->lo_owner == NULL);
down_write(&lov->lo_type_guard);
LASSERT(lov->lo_owner == NULL);
- lov->lo_owner = c
fs_current()
;
+ lov->lo_owner = c
urrent
;
}
static void lov_conf_unlock(struct lov_object *lov)
}
static void lov_conf_unlock(struct lov_object *lov)
@@
-933,7
+933,7
@@
struct lov_stripe_md *lov_lsm_addref(struct lov_object *lov)
lsm = lsm_addref(lov->lo_lsm);
CDEBUG(D_INODE, "lsm %p addref %d/%d by %p.\n",
lsm, cfs_atomic_read(&lsm->lsm_refc),
lsm = lsm_addref(lov->lo_lsm);
CDEBUG(D_INODE, "lsm %p addref %d/%d by %p.\n",
lsm, cfs_atomic_read(&lsm->lsm_refc),
- lov->lo_layout_invalid, c
fs_current()
);
+ lov->lo_layout_invalid, c
urrent
);
}
lov_conf_thaw(lov);
return lsm;
}
lov_conf_thaw(lov);
return lsm;
@@
-945,7
+945,7
@@
void lov_lsm_decref(struct lov_object *lov, struct lov_stripe_md *lsm)
return;
CDEBUG(D_INODE, "lsm %p decref %d by %p.\n",
return;
CDEBUG(D_INODE, "lsm %p decref %d by %p.\n",
- lsm, cfs_atomic_read(&lsm->lsm_refc), c
fs_current()
);
+ lsm, cfs_atomic_read(&lsm->lsm_refc), c
urrent
);
lov_free_memmd(&lsm);
}
lov_free_memmd(&lsm);
}