fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / afs / mntpt.c

diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 2a53d51..8f74e84 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"
@@ -78,7 +78,7 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode)
 
        ret = -EIO;
        wait_on_page_locked(page);
-       buf = kmap_atomic(page, KM_USER0);
+       buf = kmap(page);
        if (!PageUptodate(page))
                goto out_free;
        if (PageError(page))
@@ -101,7 +101,7 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode)
        ret = 0;
 
  out_free:
-       kunmap_atomic(buf, KM_USER0);
+       kunmap(page);
        page_cache_release(page);
  out:
        _leave(" = %d", ret);
@@ -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() */
@@ -188,9 +188,9 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
        if (!PageUptodate(page) || PageError(page))
                goto error;
 
-       buf = kmap_atomic(page, KM_USER0);
+       buf = kmap(page);
        memcpy(devname, buf, size);
-       kunmap_atomic(buf, KM_USER0);
+       kunmap(page);
        page_cache_release(page);
        page = NULL;
 
@@ -269,12 +269,12 @@ static void *afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
  */
 static void afs_mntpt_expiry_timed_out(struct afs_timer *timer)
 {
-//     kenter("");
+       kenter("");
 
        mark_mounts_for_expiry(&afs_vfsmounts);
 
        afs_kafstimod_add_timer(&afs_mntpt_expiry_timer,
                                afs_mntpt_expiry_timeout * HZ);
 
-//     kleave("");
+       kleave("");
 } /* end afs_mntpt_expiry_timed_out() */