Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

[~shefty/rdma-dev.git] / fs / nfs / pagelist.c

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 7139dbf8784e474a82e661e41c6426f5fa6b5165..b60970cc7f1f0f688c80b80674848b940265625c 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -114,7 +114,7 @@ int nfs_set_page_tag_locked(struct nfs_page *req)
        if (!nfs_lock_request_dontget(req))
                return 0;
        if (test_bit(PG_MAPPED, &req->wb_flags))
-               radix_tree_tag_set(&NFS_I(req->wb_context->path.dentry->d_inode)->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_LOCKED);
+               radix_tree_tag_set(&NFS_I(req->wb_context->dentry->d_inode)->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_LOCKED);
        return 1;
 }
 
@@ -124,7 +124,7 @@ int nfs_set_page_tag_locked(struct nfs_page *req)
 void nfs_clear_page_tag_locked(struct nfs_page *req)
 {
        if (test_bit(PG_MAPPED, &req->wb_flags)) {
-               struct inode *inode = req->wb_context->path.dentry->d_inode;
+               struct inode *inode = req->wb_context->dentry->d_inode;
                struct nfs_inode *nfsi = NFS_I(inode);
 
                spin_lock(&inode->i_lock);