diff options
| author | David Teigland <teigland@redhat.com> | 2008-02-07 08:27:04 +0300 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-02-07 08:27:04 +0300 |
| commit | d292c0cc489fa642799494bddbd7c94d11f7bbc1 (patch) | |
| tree | 5999df751f987dc59ff052ed07fc7715c00898cc /fs/dlm/user.c | |
| parent | e5dae548b0b5397e070de793be925cfc5813ad95 (diff) | |
| download | linux-d292c0cc489fa642799494bddbd7c94d11f7bbc1.tar.xz | |
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: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/user.c')
| -rw-r--r-- | fs/dlm/user.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index c3060458b68e..70b31b914870 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c @@ -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)) goto out; - DLM_ASSERT(lkb->lkb_astparam, dlm_print_lkb(lkb);); - ua = (struct dlm_user_args *)lkb->lkb_astparam; + DLM_ASSERT(lkb->lkb_ua, dlm_print_lkb(lkb);); + ua = lkb->lkb_ua; proc = ua->proc; 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_lkb *lkb; - struct dlm_user_args *ua; DECLARE_WAITQUEUE(wait, current); 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); - ua = (struct dlm_user_args *)lkb->lkb_astparam; - error = copy_result_to_user(ua, + error = copy_result_to_user(lkb->lkb_ua, test_bit(DLM_PROC_FLAGS_COMPAT, &proc->flags), type, bmode, buf, count); |