1 files changed, 11 insertions, 9 deletions

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 294604784f70..bc5bb9323412 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -964,7 +964,8 @@ static void
 nfs_clear_request_commit(struct nfs_page *req)
 {
         if (test_bit(PG_CLEAN, &req->wb_flags)) {
-                struct inode *inode = d_inode(req->wb_context->dentry);
+                struct nfs_open_context *ctx = nfs_req_openctx(req);
+                struct inode *inode = d_inode(ctx->dentry);
                 struct nfs_commit_info cinfo;
 
                 nfs_init_cinfo_from_inode(&cinfo, inode);
@@ -1219,7 +1220,7 @@ int nfs_flush_incompatible(struct file *file, struct page *page)
                         return 0;
                 l_ctx = req->wb_lock_context;
                 do_flush = req->wb_page != page ||
-                        !nfs_match_open_context(req->wb_context, ctx);
+                        !nfs_match_open_context(nfs_req_openctx(req), ctx);
                 if (l_ctx && flctx &&
                     !(list_empty_careful(&flctx->flc_posix) &&
                       list_empty_careful(&flctx->flc_flock))) {
@@ -1422,7 +1423,7 @@ static void nfs_redirty_request(struct nfs_page *req)
         /* Bump the transmission count */
         req->wb_nio++;
         nfs_mark_request_dirty(req);
-        set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags);
+        set_bit(NFS_CONTEXT_RESEND_WRITES, &nfs_req_openctx(req)->flags);
         nfs_end_page_writeback(req);
         nfs_release_request(req);
 }
@@ -1742,7 +1743,8 @@ void nfs_init_commit(struct nfs_commit_data *data,
                      struct nfs_commit_info *cinfo)
 {
         struct nfs_page *first = nfs_list_entry(head->next);
-        struct inode *inode = d_inode(first->wb_context->dentry);
+        struct nfs_open_context *ctx = nfs_req_openctx(first);
+        struct inode *inode = d_inode(ctx->dentry);
 
         /* Set up the RPC argument and reply structs
          * NB: take care not to mess about with data->commit et al. */
@@ -1750,7 +1752,7 @@ void nfs_init_commit(struct nfs_commit_data *data,
         list_splice_init(head, &data->pages);
 
         data->inode       = inode;
-        data->cred        = first->wb_context->cred;
+        data->cred        = ctx->cred;
         data->lseg        = lseg; /* reference transferred */
         /* only set lwb for pnfs commit */
         if (lseg)
@@ -1763,7 +1765,7 @@ void nfs_init_commit(struct nfs_commit_data *data,
         /* Note: we always request a commit of the entire inode */
         data->args.offset = 0;
         data->args.count  = 0;
-        data->context     = get_nfs_open_context(first->wb_context);
+        data->context     = get_nfs_open_context(ctx);
         data->res.fattr   = &data->fattr;
         data->res.verf    = &data->verf;
         nfs_fattr_init(&data->fattr);
@@ -1846,8 +1848,8 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
                         nfs_clear_page_commit(req->wb_page);
 
                 dprintk("NFS:       commit (%s/%llu %d@%lld)",
-                        req->wb_context->dentry->d_sb->s_id,
-                        (unsigned long long)NFS_FILEID(d_inode(req->wb_context->dentry)),
+                        nfs_req_openctx(req)->dentry->d_sb->s_id,
+                        (unsigned long long)NFS_FILEID(d_inode(nfs_req_openctx(req)->dentry)),
                         req->wb_bytes,
                         (long long)req_offset(req));
                 if (status < 0) {
@@ -1871,7 +1873,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
                 /* We have a mismatch. Write the page again */
                 dprintk_cont(" mismatch\n");
                 nfs_mark_request_dirty(req);
-                set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags);
+                set_bit(NFS_CONTEXT_RESEND_WRITES, &nfs_req_openctx(req)->flags);
         next:
                 nfs_unlock_and_release_request(req);
                 /* Latency breaker */