These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / ocfs2 / locks.c

diff --git a/kernel/fs/ocfs2/locks.c b/kernel/fs/ocfs2/locks.c
index 6b6d092..d56f007 100644 (file)
--- a/kernel/fs/ocfs2/locks.c
+++ b/kernel/fs/ocfs2/locks.c
@@ -66,8 +66,11 @@ static int ocfs2_do_flock(struct file *file, struct inode *inode,
                 * level.
                 */
 
-               flock_lock_file_wait(file,
-                                    &(struct file_lock){.fl_type = F_UNLCK});
+               locks_lock_file_wait(file,
+                               &(struct file_lock) {
+                                       .fl_type = F_UNLCK,
+                                       .fl_flags = FL_FLOCK
+                               });
 
                ocfs2_file_unlock(file);
        }
@@ -81,7 +84,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 +101,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 +122,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);