Merge remote-tracking branch 'file-locks/linux-next'
[karo-tx-linux.git] / fs / cifs / file.c
index 62203c3..47c5c97 100644 (file)
@@ -1553,7 +1553,7 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type,
 
 out:
        if (flock->fl_flags & FL_POSIX && !rc)
-               rc = posix_lock_file_wait(file, flock);
+               rc = locks_lock_file_wait(file, flock);
        return rc;
 }