Commit 7d62a978 authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

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: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 6800791a

fs/ocfs2/dlm/dlmcommon.h

+18 −3
Original line number Diff line number Diff line
@@ -858,9 +858,7 @@ struct dlm_lock_resource * dlm_lookup_lockres(struct dlm_ctxt *dlm, 
					      unsigned int len);



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,

						 const char *lockid,

						 int namelen,
@@ -1123,6 +1121,23 @@ static inline int dlm_node_iter_next(struct dlm_node_iter *iter) 
	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 */

fs/ocfs2/dlm/dlmmaster.c

+0 −19
Original line number Diff line number Diff line
@@ -511,25 +511,6 @@ void dlm_destroy_master_caches(void) 
		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)

{

	struct dlm_lock_resource *res;