Move locks API users to locks_lock_inode_wait()

Instead of having users check for FL_POSIX or FL_FLOCK to call the correct
locks API function, use the check within locks_lock_inode_wait().  This
allows for some later cleanup.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index 5532f097f6da..3585cc056fd1 100644
--- 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;