ocfs2/dlm: dlm_set_lockres_owner() and dlm_change_lockres_owner() inlined
This patch inlines dlm_set_lockres_owner() and dlm_change_lockres_owner(). Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
parent
6800791ab7
commit
7d62a978a8
|
@ -858,9 +858,7 @@ struct dlm_lock_resource * dlm_lookup_lockres(struct dlm_ctxt *dlm,
|
||||||
unsigned int len);
|
unsigned int len);
|
||||||
|
|
||||||
int dlm_is_host_down(int errno);
|
int dlm_is_host_down(int errno);
|
||||||
void dlm_change_lockres_owner(struct dlm_ctxt *dlm,
|
|
||||||
struct dlm_lock_resource *res,
|
|
||||||
u8 owner);
|
|
||||||
struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm,
|
struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm,
|
||||||
const char *lockid,
|
const char *lockid,
|
||||||
int namelen,
|
int namelen,
|
||||||
|
@ -1123,6 +1121,23 @@ static inline int dlm_node_iter_next(struct dlm_node_iter *iter)
|
||||||
return bit;
|
return bit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void dlm_set_lockres_owner(struct dlm_ctxt *dlm,
|
||||||
|
struct dlm_lock_resource *res,
|
||||||
|
u8 owner)
|
||||||
|
{
|
||||||
|
assert_spin_locked(&res->spinlock);
|
||||||
|
|
||||||
|
res->owner = owner;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void dlm_change_lockres_owner(struct dlm_ctxt *dlm,
|
||||||
|
struct dlm_lock_resource *res,
|
||||||
|
u8 owner)
|
||||||
|
{
|
||||||
|
assert_spin_locked(&res->spinlock);
|
||||||
|
|
||||||
|
if (owner != res->owner)
|
||||||
|
dlm_set_lockres_owner(dlm, res, owner);
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* DLMCOMMON_H */
|
#endif /* DLMCOMMON_H */
|
||||||
|
|
|
@ -511,25 +511,6 @@ void dlm_destroy_master_caches(void)
|
||||||
kmem_cache_destroy(dlm_lockres_cache);
|
kmem_cache_destroy(dlm_lockres_cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dlm_set_lockres_owner(struct dlm_ctxt *dlm,
|
|
||||||
struct dlm_lock_resource *res,
|
|
||||||
u8 owner)
|
|
||||||
{
|
|
||||||
assert_spin_locked(&res->spinlock);
|
|
||||||
|
|
||||||
res->owner = owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
void dlm_change_lockres_owner(struct dlm_ctxt *dlm,
|
|
||||||
struct dlm_lock_resource *res, u8 owner)
|
|
||||||
{
|
|
||||||
assert_spin_locked(&res->spinlock);
|
|
||||||
|
|
||||||
if (owner != res->owner)
|
|
||||||
dlm_set_lockres_owner(dlm, res, owner);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static void dlm_lockres_release(struct kref *kref)
|
static void dlm_lockres_release(struct kref *kref)
|
||||||
{
|
{
|
||||||
struct dlm_lock_resource *res;
|
struct dlm_lock_resource *res;
|
||||||
|
|
Loading…
Reference in New Issue