Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dlm: eliminate astparam type casting

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

Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
David Teigland 2008-02-06 23:27:04 -06:00
parent e5dae548b0
commit d292c0cc48
6 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/dlm/debug_fs.c
View file

@ -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) 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; unsigned int waiting = 0;
uint64_t xid = 0; uint64_t xid = 0;
if (lkb->lkb_flags & DLM_IFL_USER) { if (lkb->lkb_flags & DLM_IFL_USER) {
ua = (struct dlm_user_args *) lkb->lkb_astparam; if (lkb->lkb_ua)
if (ua) xid = lkb->lkb_ua->xid;
xid = ua->xid;
} }
if (lkb->lkb_timestamp) if (lkb->lkb_timestamp)

5
fs/dlm/dlm_internal.h
View file

@ -253,7 +253,10 @@ struct dlm_lkb {
struct dlm_lksb *lkb_lksb; /* caller's status block */ struct dlm_lksb *lkb_lksb; /* caller's status block */
void (*lkb_astfn) (void *astparam); void (*lkb_astfn) (void *astparam);
void (*lkb_bastfn) (void *astparam, int mode); void (*lkb_bastfn) (void *astparam, int mode);
void *lkb_astparam; /* caller's ast arg */ union {
void *lkb_astparam; /* caller's ast arg */
struct dlm_user_args *lkb_ua;
};
}; };

14
fs/dlm/lock.c
View file

@ -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 /* user can change the params on its lock when it converts it, or
add an lvb that didn't exist before */ 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) { if (flags & DLM_LKF_VALBLK && !ua->lksb.sb_lvbptr) {
ua->lksb.sb_lvbptr = kzalloc(DLM_USER_LVB_LEN, GFP_KERNEL); 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) if (error)
goto out; goto out;
ua = (struct dlm_user_args *)lkb->lkb_astparam; ua = lkb->lkb_ua;
if (lvb_in && ua->lksb.sb_lvbptr) if (lvb_in && ua->lksb.sb_lvbptr)
memcpy(ua->lksb.sb_lvbptr, lvb_in, DLM_USER_LVB_LEN); 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) if (error)
goto out; goto out;
ua = (struct dlm_user_args *)lkb->lkb_astparam; ua = lkb->lkb_ua;
if (ua_tmp->castparam) if (ua_tmp->castparam)
ua->castparam = ua_tmp->castparam; ua->castparam = ua_tmp->castparam;
ua->user_lksb = ua_tmp->user_lksb; 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) if (error)
goto out; goto out;
ua = (struct dlm_user_args *)lkb->lkb_astparam; ua = lkb->lkb_ua;
error = set_unlock_args(flags, ua, &args); error = set_unlock_args(flags, ua, &args);
if (error) 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) 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; struct dlm_args args;
int error; 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); list_add_tail(&lkb->lkb_ownqueue, &ls->ls_orphans);
mutex_unlock(&ls->ls_orphans_mutex); 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); error = cancel_lock(ls, lkb, &args);
if (error == -DLM_ECANCEL) 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) 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; struct dlm_args args;
int error; 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); error = unlock_lock(ls, lkb, &args);
if (error == -DLM_EUNLOCK) if (error == -DLM_EUNLOCK)

2
fs/dlm/memory.c
View file

@ -80,7 +80,7 @@ void dlm_free_lkb(struct dlm_lkb *lkb)
{ {
if (lkb->lkb_flags & DLM_IFL_USER) { if (lkb->lkb_flags & DLM_IFL_USER) {
struct dlm_user_args *ua; struct dlm_user_args *ua;
ua = (struct dlm_user_args *)lkb->lkb_astparam; ua = lkb->lkb_ua;
if (ua) { if (ua) {
if (ua->lksb.sb_lvbptr) if (ua->lksb.sb_lvbptr)
kfree(ua->lksb.sb_lvbptr); kfree(ua->lksb.sb_lvbptr);

5
fs/dlm/netlink.c
View file

@ -104,7 +104,6 @@ void dlm_netlink_exit(void)
static void fill_data(struct dlm_lock_data *data, struct dlm_lkb *lkb) static void fill_data(struct dlm_lock_data *data, struct dlm_lkb *lkb)
{ {
struct dlm_rsb *r = lkb->lkb_resource; 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)); 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->grmode = lkb->lkb_grmode;
data->rqmode = lkb->lkb_rqmode; data->rqmode = lkb->lkb_rqmode;
data->timestamp = lkb->lkb_timestamp; data->timestamp = lkb->lkb_timestamp;
if (ua) if (lkb->lkb_ua)
data->xid = ua->xid; data->xid = lkb->lkb_ua->xid;
if (r) { if (r) {
data->lockspace_id = r->res_ls->ls_global_id; data->lockspace_id = r->res_ls->ls_global_id;
data->resource_namelen = r->res_length; data->resource_namelen = r->res_length;

8
fs/dlm/user.c
View file

@ -195,8 +195,8 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, int type)
if (lkb->lkb_flags & (DLM_IFL_ORPHAN | DLM_IFL_DEAD)) if (lkb->lkb_flags & (DLM_IFL_ORPHAN | DLM_IFL_DEAD))
goto out; goto out;
DLM_ASSERT(lkb->lkb_astparam, dlm_print_lkb(lkb);); DLM_ASSERT(lkb->lkb_ua, dlm_print_lkb(lkb););
ua = (struct dlm_user_args *)lkb->lkb_astparam; ua = lkb->lkb_ua;
proc = ua->proc; proc = ua->proc;
if (type == AST_BAST && ua->bastaddr == NULL) if (type == AST_BAST && ua->bastaddr == NULL)
@ -771,7 +771,6 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,
{ {
struct dlm_user_proc *proc = file->private_data; struct dlm_user_proc *proc = file->private_data;
struct dlm_lkb *lkb; struct dlm_lkb *lkb;
struct dlm_user_args *ua;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
int error, type=0, bmode=0, removed = 0; int error, type=0, bmode=0, removed = 0;
@ -842,8 +841,7 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,
} }
spin_unlock(&proc->asts_spin); spin_unlock(&proc->asts_spin);
ua = (struct dlm_user_args *)lkb->lkb_astparam; error = copy_result_to_user(lkb->lkb_ua,
error = copy_result_to_user(ua,
test_bit(DLM_PROC_FLAGS_COMPAT, &proc->flags), test_bit(DLM_PROC_FLAGS_COMPAT, &proc->flags),
type, bmode, buf, count); type, bmode, buf, count);