Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[~andy/linux] / fs / dlm / dlm_internal.h

diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index a53c237f310c6f613acb3ec1707bd15d1fd78373..d30ea8b433a289b9040e49b0af37e8757fe13376 100644 (file)
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -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);
-       void                    *lkb_astparam;  /* caller's ast arg */
+       union {
+               void                    *lkb_astparam;  /* caller's ast arg */
+               struct dlm_user_args    *lkb_ua;
+       };
 };