summaryrefslogtreecommitdiff
path: root/fs/dlm/netlink.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2008-02-07 08:27:04 +0300
committerDavid Teigland <teigland@redhat.com>2008-02-07 08:27:04 +0300
commitd292c0cc489fa642799494bddbd7c94d11f7bbc1 (patch)
tree5999df751f987dc59ff052ed07fc7715c00898cc /fs/dlm/netlink.c
parente5dae548b0b5397e070de793be925cfc5813ad95 (diff)
downloadlinux-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/netlink.c')
-rw-r--r--fs/dlm/netlink.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c
index 863b87d0dc71..90374b848761 100644
--- a/fs/dlm/netlink.c
+++ b/fs/dlm/netlink.c
@@ -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;