Merge tag 'dlm-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[people/ms/linux.git] / fs / dlm / plock.c

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index 88f103650448846c6493410f9a4822af2b8fd48e..d401425f602a45c9a70828f15ee2f35aee1601b6 100644 (file)
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -172,7 +172,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
        rv = op->info.rv;
 
        if (!rv) {
-               if (posix_lock_file_wait(file, fl) < 0)
+               if (locks_lock_file_wait(file, fl) < 0)
                        log_error(ls, "dlm_posix_lock: vfs lock error %llx",
                                  (unsigned long long)number);
        }
@@ -262,7 +262,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
        /* cause the vfs unlock to return ENOENT if lock is not found */
        fl->fl_flags |= FL_EXISTS;
 
-       rv = posix_lock_file_wait(file, fl);
+       rv = locks_lock_file_wait(file, fl);
        if (rv == -ENOENT) {
                rv = 0;
                goto out_free;