[PATCH] i386: paravirt CPU hypercall batching mode

[safe/jmp/linux-2.6] / fs / afs / mntpt.c

diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 99785a7..fdf23b2 100644 (file)
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -18,7 +18,7 @@
 #include <linux/pagemap.h>
 #include <linux/mount.h>
 #include <linux/namei.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include "super.h"
 #include "cell.h"
 #include "volume.h"
@@ -36,7 +36,7 @@ const struct file_operations afs_mntpt_file_operations = {
        .open           = afs_mntpt_open,
 };
 
-struct inode_operations afs_mntpt_inode_operations = {
+const struct inode_operations afs_mntpt_inode_operations = {
        .lookup         = afs_mntpt_lookup,
        .follow_link    = afs_mntpt_follow_link,
        .readlink       = page_readlink,
@@ -136,11 +136,11 @@ static int afs_mntpt_open(struct inode *inode, struct file *file)
 {
        kenter("%p,%p{%p{%s},%s}",
               inode, file,
-              file->f_dentry->d_parent,
-              file->f_dentry->d_parent ?
-              file->f_dentry->d_parent->d_name.name :
+              file->f_path.dentry->d_parent,
+              file->f_path.dentry->d_parent ?
+              file->f_path.dentry->d_parent->d_name.name :
               (const unsigned char *) "",
-              file->f_dentry->d_name.name);
+              file->f_path.dentry->d_name.name);
 
        return -EREMOTE;
 } /* end afs_mntpt_open() */