Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / fs / nfsd / nfsctl.c

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 97543df58242f1bc54244aeac633a4fc2e139c8f..e3f9783fdcf7eba3872331b0c48f5aee7207fd62 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -341,7 +341,7 @@ static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size)
 
 static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size)
 {
-       struct nameidata nd;
+       struct path path;
        char *fo_path;
        int error;
 
@@ -356,13 +356,13 @@ static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size)
        if (qword_get(&buf, fo_path, size) < 0)
                return -EINVAL;
 
-       error = path_lookup(fo_path, 0, &nd);
+       error = kern_path(fo_path, 0, &path);
        if (error)
                return error;
 
-       error = nlmsvc_unlock_all_by_sb(nd.path.mnt->mnt_sb);
+       error = nlmsvc_unlock_all_by_sb(path.mnt->mnt_sb);
 
-       path_put(&nd.path);
+       path_put(&path);
        return error;
 }