Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / locks.c

diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index 6b6d092b09985941f856671722d6db52e1fd035d..652ece4a9d9e2e90a72a95b4be1d910ea46cfc9f 100644 (file)
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -66,7 +66,7 @@ static int ocfs2_do_flock(struct file *file, struct inode *inode,
                 * level.
                 */
 
-               flock_lock_file_wait(file,
+               locks_lock_file_wait(file,
                                     &(struct file_lock){.fl_type = F_UNLCK});
 
                ocfs2_file_unlock(file);
@@ -81,7 +81,7 @@ static int ocfs2_do_flock(struct file *file, struct inode *inode,
                goto out;
        }
 
-       ret = flock_lock_file_wait(file, fl);
+       ret = locks_lock_file_wait(file, fl);
        if (ret)
                ocfs2_file_unlock(file);
 
@@ -98,7 +98,7 @@ static int ocfs2_do_funlock(struct file *file, int cmd, struct file_lock *fl)
 
        mutex_lock(&fp->fp_mutex);
        ocfs2_file_unlock(file);
-       ret = flock_lock_file_wait(file, fl);
+       ret = locks_lock_file_wait(file, fl);
        mutex_unlock(&fp->fp_mutex);
 
        return ret;
@@ -119,7 +119,7 @@ int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl)
 
        if ((osb->s_mount_opt & OCFS2_MOUNT_LOCALFLOCKS) ||
            ocfs2_mount_local(osb))
-               return flock_lock_file_wait(file, fl);
+               return locks_lock_file_wait(file, fl);
 
        if (fl->fl_type == F_UNLCK)
                return ocfs2_do_funlock(file, cmd, fl);