Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (57 commits)
  [GFS2] make gfs2_writepages() static
  [GFS2] Unlock page on prepare_write try lock failure
  [GFS2] nfsd readdirplus assertion failure
  [DLM] fix softlockup in dlm_recv
  [DLM] zero new user lvbs
  [DLM/GFS2] indent help text
  [GFS2] Fix unlink deadlocks
  [GFS2] Put back semaphore to avoid umount problem
  [GFS2] more CURRENT_TIME_SEC
  [GFS2/DLM] fix GFS2 circular dependency
  [GFS2/DLM] use sysfs
  [GFS2] make lock_dlm drop_count tunable in sysfs
  [GFS2] increase default lock limit
  [GFS2] Fix list corruption in lops.c
  [GFS2] Fix recursive locking attempt with NFS
  [DLM] can miss clearing resend flag
  [DLM] saved dlm message can be dropped
  [DLM] Make sock_sem into a mutex
  [GFS2] Fix typo in glock.c
  [GFS2] use CURRENT_TIME_SEC instead of get_seconds in gfs2
  ...

1 files changed, 9 insertions, 0 deletions

diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index c37e93e4f2df..d378b7fe2a1e 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -180,6 +180,14 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, int type)
             ua->lksb.sb_status == -EAGAIN && !list_empty(&lkb->lkb_ownqueue))
                 remove_ownqueue = 1;
 
+        /* unlocks or cancels of waiting requests need to be removed from the
+           proc's unlocking list, again there must be a better way...  */
+
+        if (ua->lksb.sb_status == -DLM_EUNLOCK ||
+            (ua->lksb.sb_status == -DLM_ECANCEL &&
+             lkb->lkb_grmode == DLM_LOCK_IV))
+                remove_ownqueue = 1;
+
         /* We want to copy the lvb to userspace when the completion
            ast is read if the status is 0, the lock has an lvb and
            lvb_ops says we should.  We could probably have set_lvb_lock()
@@ -523,6 +531,7 @@ static int device_open(struct inode *inode, struct file *file)
         proc->lockspace = ls->ls_local_handle;
         INIT_LIST_HEAD(&proc->asts);
         INIT_LIST_HEAD(&proc->locks);
+        INIT_LIST_HEAD(&proc->unlocking);
         spin_lock_init(&proc->asts_spin);
         spin_lock_init(&proc->locks_spin);
         init_waitqueue_head(&proc->wait);