Merge branch 'akpm-current/current'

[karo-tx-linux.git] / fs / 9p / vfs_file.c

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 6b747394f6f566dfbd7e2608d1690f88f81e4206..7bf835f85bc822ef1119b639be82619af066d326 100644 (file)
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -161,7 +161,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)
        if ((fl->fl_flags & FL_POSIX) != FL_POSIX)
                BUG();
 
-       res = posix_lock_file_wait(filp, fl);
+       res = locks_lock_file_wait(filp, fl);
        if (res < 0)
                goto out;
 
@@ -232,7 +232,7 @@ out_unlock:
                fl_type = fl->fl_type;
                fl->fl_type = F_UNLCK;
                /* Even if this fails we want to return the remote error */
-               posix_lock_file_wait(filp, fl);
+               locks_lock_file_wait(filp, fl);
                fl->fl_type = fl_type;
        }
 out: