Merge branch 'akpm-current/current'

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

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 2d319e66b8f84ea0e78c37e5ffdf5782bdd3aa4e..0a2752b79e72cc2b7a083894843a8b3ae1dea23d 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)
-               rc = posix_lock_file_wait(file, flock);
+               rc = locks_lock_file_wait(file, flock);
        return rc;
 }