Merge remote-tracking branch 'file-locks/linux-next'

[karo-tx-linux.git] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 62203c387db45a23b05c1cadcc0946843ea5332f..47c5c97e2dd31c20663f1fa0584da2c3f87722bd 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1553,7 +1553,7 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type,
 
 out:
        if (flock->fl_flags & FL_POSIX && !rc)
 
 out:
        if (flock->fl_flags & FL_POSIX && !rc)

-               rc = posix_lock_file_wait(file, flock);
+               rc = locks_lock_file_wait(file, flock);

        return rc;
 }
 
        return rc;
 }