Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[pandora-kernel.git] / fs / dlm / netlink.c

diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c
index 863b87d..18bda83 100644 (file)
--- a/fs/dlm/netlink.c
+++ b/fs/dlm/netlink.c
@@ -78,7 +78,7 @@ static struct genl_ops dlm_nl_ops = {
        .doit           = user_cmd,
 };
 
-int dlm_netlink_init(void)
+int __init dlm_netlink_init(void)
 {
        int rv;
 
@@ -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;