aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-06-05 10:42:27 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-07-10 23:40:23 -0400
commit88be9f990fe70f0f177ef44a16a477599e91f825 (patch)
treed48ed0c934fc20dc3f7cacfc3b1eca3058246b65 /fs/nfs/write.c
parentde05a0cc2a2ae16eb8d8dbf88fe728ace45beb9a (diff)
NFS: Replace vfsmount and dentry in nfs_open_context with struct path
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index b853959d964d..9e7c21da864f 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -407,7 +407,7 @@ static int nfs_inode_add_request(struct inode *inode, struct nfs_page *req)
407 */ 407 */
408static void nfs_inode_remove_request(struct nfs_page *req) 408static void nfs_inode_remove_request(struct nfs_page *req)
409{ 409{
410 struct inode *inode = req->wb_context->dentry->d_inode; 410 struct inode *inode = req->wb_context->path.dentry->d_inode;
411 struct nfs_inode *nfsi = NFS_I(inode); 411 struct nfs_inode *nfsi = NFS_I(inode);
412 412
413 BUG_ON (!NFS_WBACK_BUSY(req)); 413 BUG_ON (!NFS_WBACK_BUSY(req));
@@ -455,7 +455,7 @@ nfs_dirty_request(struct nfs_page *req)
455static void 455static void
456nfs_mark_request_commit(struct nfs_page *req) 456nfs_mark_request_commit(struct nfs_page *req)
457{ 457{
458 struct inode *inode = req->wb_context->dentry->d_inode; 458 struct inode *inode = req->wb_context->path.dentry->d_inode;
459 struct nfs_inode *nfsi = NFS_I(inode); 459 struct nfs_inode *nfsi = NFS_I(inode);
460 460
461 spin_lock(&nfsi->req_lock); 461 spin_lock(&nfsi->req_lock);
@@ -789,7 +789,7 @@ static void nfs_write_rpcsetup(struct nfs_page *req,
789 * NB: take care not to mess about with data->commit et al. */ 789 * NB: take care not to mess about with data->commit et al. */
790 790
791 data->req = req; 791 data->req = req;
792 data->inode = inode = req->wb_context->dentry->d_inode; 792 data->inode = inode = req->wb_context->path.dentry->d_inode;
793 data->cred = req->wb_context->cred; 793 data->cred = req->wb_context->cred;
794 794
795 data->args.fh = NFS_FH(inode); 795 data->args.fh = NFS_FH(inode);
@@ -957,8 +957,8 @@ static void nfs_writeback_done_partial(struct rpc_task *task, void *calldata)
957 struct page *page = req->wb_page; 957 struct page *page = req->wb_page;
958 958
959 dprintk("NFS: write (%s/%Ld %d@%Ld)", 959 dprintk("NFS: write (%s/%Ld %d@%Ld)",
960 req->wb_context->dentry->d_inode->i_sb->s_id, 960 req->wb_context->path.dentry->d_inode->i_sb->s_id,
961 (long long)NFS_FILEID(req->wb_context->dentry->d_inode), 961 (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode),
962 req->wb_bytes, 962 req->wb_bytes,
963 (long long)req_offset(req)); 963 (long long)req_offset(req));
964 964
@@ -1023,8 +1023,8 @@ static void nfs_writeback_done_full(struct rpc_task *task, void *calldata)
1023 page = req->wb_page; 1023 page = req->wb_page;
1024 1024
1025 dprintk("NFS: write (%s/%Ld %d@%Ld)", 1025 dprintk("NFS: write (%s/%Ld %d@%Ld)",
1026 req->wb_context->dentry->d_inode->i_sb->s_id, 1026 req->wb_context->path.dentry->d_inode->i_sb->s_id,
1027 (long long)NFS_FILEID(req->wb_context->dentry->d_inode), 1027 (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode),
1028 req->wb_bytes, 1028 req->wb_bytes,
1029 (long long)req_offset(req)); 1029 (long long)req_offset(req));
1030 1030
@@ -1162,7 +1162,7 @@ static void nfs_commit_rpcsetup(struct list_head *head,
1162 1162
1163 list_splice_init(head, &data->pages); 1163 list_splice_init(head, &data->pages);
1164 first = nfs_list_entry(data->pages.next); 1164 first = nfs_list_entry(data->pages.next);
1165 inode = first->wb_context->dentry->d_inode; 1165 inode = first->wb_context->path.dentry->d_inode;
1166 1166
1167 data->inode = inode; 1167 data->inode = inode;
1168 data->cred = first->wb_context->cred; 1168 data->cred = first->wb_context->cred;
@@ -1239,8 +1239,8 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata)
1239 dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); 1239 dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
1240 1240
1241 dprintk("NFS: commit (%s/%Ld %d@%Ld)", 1241 dprintk("NFS: commit (%s/%Ld %d@%Ld)",
1242 req->wb_context->dentry->d_inode->i_sb->s_id, 1242 req->wb_context->path.dentry->d_inode->i_sb->s_id,
1243 (long long)NFS_FILEID(req->wb_context->dentry->d_inode), 1243 (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode),
1244 req->wb_bytes, 1244 req->wb_bytes,
1245 (long long)req_offset(req)); 1245 (long long)req_offset(req));
1246 if (task->tk_status < 0) { 1246 if (task->tk_status < 0) {