]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
[DLM] down conversion clearing flags
authorPatrick Caulfield <pcaulfie@redhat.com>
Wed, 23 Aug 2006 09:24:03 +0000 (10:24 +0100)
committerSteven Whitehouse <swhiteho@redhat.com>
Wed, 23 Aug 2006 14:33:06 +0000 (10:33 -0400)
Oh, and here's (hopefully) the last of these ua_tmp patches. I think I've
caught all the paths now. Sorry it didn't make the last one.

Signed-off-by: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
fs/dlm/lock.c

index 7ffbe8090de0382a22b91c8ed7f47bfdaca72bab..6dcd475826c185e21ae7512ee3819d411703bc21 100644 (file)
@@ -3765,6 +3765,7 @@ int dlm_user_cancel(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,
 
        ua = (struct dlm_user_args *)lkb->lkb_astparam;
        ua->castparam = ua_tmp->castparam;
+       ua->user_lksb = ua_tmp->user_lksb;
 
        error = set_unlock_args(flags, ua, &args);
        if (error)