Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d292c0cc authored by David Teigland's avatar David Teigland
Browse files

dlm: eliminate astparam type casting 



Put lkb_astparam in a union with a dlm_user_args pointer to
eliminate a lot of type casting.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent e5dae548

fs/dlm/debug_fs.c

+2 −4
Original line number Diff line number Diff line
@@ -162,14 +162,12 @@ static int print_resource(struct dlm_rsb *res, struct seq_file *s) 


static void print_lock(struct seq_file *s, struct dlm_lkb *lkb, struct dlm_rsb *r)

{

	struct dlm_user_args *ua;

	unsigned int waiting = 0;

	uint64_t xid = 0;



	if (lkb->lkb_flags & DLM_IFL_USER) {

		ua = (struct dlm_user_args *) lkb->lkb_astparam;

		if (ua)

			xid = ua->xid;

		if (lkb->lkb_ua)

			xid = lkb->lkb_ua->xid;

	}



	if (lkb->lkb_timestamp)

fs/dlm/dlm_internal.h

+4 −1
Original line number Diff line number Diff line
@@ -253,7 +253,10 @@ struct dlm_lkb { 
	struct dlm_lksb		*lkb_lksb;      /* caller's status block */

	void			(*lkb_astfn) (void *astparam);

	void			(*lkb_bastfn) (void *astparam, int mode);

	union {

		void			*lkb_astparam;	/* caller's ast arg */

		struct dlm_user_args	*lkb_ua;

	};

};

fs/dlm/lock.c

+6 −8
Original line number Diff line number Diff line
@@ -4533,7 +4533,7 @@ int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
	/* user can change the params on its lock when it converts it, or

	   add an lvb that didn't exist before */



	ua = (struct dlm_user_args *)lkb->lkb_astparam;

	ua = lkb->lkb_ua;



	if (flags & DLM_LKF_VALBLK && !ua->lksb.sb_lvbptr) {

		ua->lksb.sb_lvbptr = kzalloc(DLM_USER_LVB_LEN, GFP_KERNEL);
@@ -4584,7 +4584,7 @@ int dlm_user_unlock(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
	if (error)

		goto out;



	ua = (struct dlm_user_args *)lkb->lkb_astparam;

	ua = lkb->lkb_ua;



	if (lvb_in && ua->lksb.sb_lvbptr)

		memcpy(ua->lksb.sb_lvbptr, lvb_in, DLM_USER_LVB_LEN);
@@ -4633,7 +4633,7 @@ int dlm_user_cancel(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
	if (error)

		goto out;



	ua = (struct dlm_user_args *)lkb->lkb_astparam;

	ua = lkb->lkb_ua;

	if (ua_tmp->castparam)

		ua->castparam = ua_tmp->castparam;

	ua->user_lksb = ua_tmp->user_lksb;
@@ -4671,7 +4671,7 @@ int dlm_user_deadlock(struct dlm_ls *ls, uint32_t flags, uint32_t lkid) 
	if (error)

		goto out;



	ua = (struct dlm_user_args *)lkb->lkb_astparam;

	ua = lkb->lkb_ua;



	error = set_unlock_args(flags, ua, &args);

	if (error)
@@ -4710,7 +4710,6 @@ int dlm_user_deadlock(struct dlm_ls *ls, uint32_t flags, uint32_t lkid) 


static int orphan_proc_lock(struct dlm_ls *ls, struct dlm_lkb *lkb)

{

	struct dlm_user_args *ua = (struct dlm_user_args *)lkb->lkb_astparam;

	struct dlm_args args;

	int error;
@@ -4719,7 +4718,7 @@ static int orphan_proc_lock(struct dlm_ls *ls, struct dlm_lkb *lkb) 
	list_add_tail(&lkb->lkb_ownqueue, &ls->ls_orphans);

	mutex_unlock(&ls->ls_orphans_mutex);



	set_unlock_args(0, ua, &args);

	set_unlock_args(0, lkb->lkb_ua, &args);



	error = cancel_lock(ls, lkb, &args);

	if (error == -DLM_ECANCEL)
@@ -4732,11 +4731,10 @@ static int orphan_proc_lock(struct dlm_ls *ls, struct dlm_lkb *lkb) 


static int unlock_proc_lock(struct dlm_ls *ls, struct dlm_lkb *lkb)

{

	struct dlm_user_args *ua = (struct dlm_user_args *)lkb->lkb_astparam;

	struct dlm_args args;

	int error;



	set_unlock_args(DLM_LKF_FORCEUNLOCK, ua, &args);

	set_unlock_args(DLM_LKF_FORCEUNLOCK, lkb->lkb_ua, &args);



	error = unlock_lock(ls, lkb, &args);

	if (error == -DLM_EUNLOCK)

fs/dlm/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void dlm_free_lkb(struct dlm_lkb *lkb) 
{

	if (lkb->lkb_flags & DLM_IFL_USER) {

		struct dlm_user_args *ua;

		ua = (struct dlm_user_args *)lkb->lkb_astparam;

		ua = lkb->lkb_ua;

		if (ua) {

			if (ua->lksb.sb_lvbptr)

				kfree(ua->lksb.sb_lvbptr);

fs/dlm/netlink.c

+2 −3
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ void dlm_netlink_exit(void) 
static void fill_data(struct dlm_lock_data *data, struct dlm_lkb *lkb)

{

	struct dlm_rsb *r = lkb->lkb_resource;

	struct dlm_user_args *ua = (struct dlm_user_args *) lkb->lkb_astparam;



	memset(data, 0, sizeof(struct dlm_lock_data));
@@ -117,8 +116,8 @@ static void fill_data(struct dlm_lock_data *data, struct dlm_lkb *lkb) 
	data->grmode = lkb->lkb_grmode;

	data->rqmode = lkb->lkb_rqmode;

	data->timestamp = lkb->lkb_timestamp;

	if (ua)

		data->xid = ua->xid;

	if (lkb->lkb_ua)

		data->xid = lkb->lkb_ua->xid;

	if (r) {

		data->lockspace_id = r->res_ls->ls_global_id;

		data->resource_namelen = r->res_length;