2 files changed, 4 insertions, 10 deletions

diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index dac5b990c0cd..0c1e902f17a3 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -194,10 +194,7 @@ static struct page *afs_dir_get_page(struct inode *dir, unsigned long index,
 
         page = read_mapping_page(dir->i_mapping, index, &file);
         if (!IS_ERR(page)) {
-                wait_on_page_locked(page);
                 kmap(page);
-                if (!PageUptodate(page))
-                        goto fail;
                 if (!PageChecked(page))
                         afs_dir_check_page(dir, page);
                 if (PageError(page))
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index b905ae37f912..034fcfd4e330 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -68,13 +68,11 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode, struct key *key)
         }
 
         ret = -EIO;
-        wait_on_page_locked(page);
-        buf = kmap(page);
-        if (!PageUptodate(page))
-                goto out_free;
         if (PageError(page))
                 goto out_free;
 
+        buf = kmap(page);
+
         /* examine the symlink's contents */
         size = vnode->status.size;
         _debug("symlink to %*.*s", (int) size, (int) size, buf);
@@ -91,8 +89,8 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode, struct key *key)
 
         ret = 0;
 
-out_free:
         kunmap(page);
+out_free:
         page_cache_release(page);
 out:
         _leave(" = %d", ret);
@@ -171,8 +169,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
         }
 
         ret = -EIO;
-        wait_on_page_locked(page);
-        if (!PageUptodate(page) || PageError(page))
+        if (PageError(page))
                 goto error;
 
         buf = kmap(page);