fs/locks: merge posix_unblock_lock() and locks_delete_block()

[linux-2.6-block.git] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 74c33d5fafc83ff841a43b15ad222a34acb860d4..94c3575e850c4a1d0e13ddd80145aca36bf5db2e 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1103,10 +1103,10 @@ try_again:
        rc = posix_lock_file(file, flock, NULL);
        up_write(&cinode->lock_sem);
        if (rc == FILE_LOCK_DEFERRED) {
-               rc = wait_event_interruptible(flock->fl_wait, !flock->fl_next);
+               rc = wait_event_interruptible(flock->fl_wait, !flock->fl_blocker);
                if (!rc)
                        goto try_again;
-               posix_unblock_lock(flock);
+               locks_delete_block(flock);
        }
        return rc;
 }