diff options
author | Fred Isaman <iisaman@netapp.com> | 2012-04-20 14:47:55 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-27 14:10:38 -0400 |
commit | b359f9d09bcbaede09243cfe844172ba055d89fd (patch) | |
tree | 877bf10e68d09d15e042e28a8fbb0ac93136d64c /fs/nfs/write.c | |
parent | f453a54a01c7c0453ad9550906e3d2663dd486ac (diff) |
NFS: add dreq to nfs_commit_info
Need this to pass into nfs_commitdata_init, in order to keep data->dreq
accurate.
Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r-- | fs/nfs/write.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 333d01d26292..44a93d8c7b52 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -506,6 +506,7 @@ static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo, | |||
506 | cinfo->lock = &inode->i_lock; | 506 | cinfo->lock = &inode->i_lock; |
507 | cinfo->mds = &NFS_I(inode)->commit_info; | 507 | cinfo->mds = &NFS_I(inode)->commit_info; |
508 | cinfo->ds = pnfs_get_ds_info(inode); | 508 | cinfo->ds = pnfs_get_ds_info(inode); |
509 | cinfo->dreq = NULL; | ||
509 | cinfo->completion_ops = &nfs_commit_completion_ops; | 510 | cinfo->completion_ops = &nfs_commit_completion_ops; |
510 | } | 511 | } |
511 | 512 | ||
@@ -1431,6 +1432,7 @@ void nfs_init_commit(struct nfs_commit_data *data, | |||
1431 | data->lseg = lseg; /* reference transferred */ | 1432 | data->lseg = lseg; /* reference transferred */ |
1432 | data->mds_ops = &nfs_commit_ops; | 1433 | data->mds_ops = &nfs_commit_ops; |
1433 | data->completion_ops = cinfo->completion_ops; | 1434 | data->completion_ops = cinfo->completion_ops; |
1435 | data->dreq = cinfo->dreq; | ||
1434 | 1436 | ||
1435 | data->args.fh = NFS_FH(data->inode); | 1437 | data->args.fh = NFS_FH(data->inode); |
1436 | /* Note: we always request a commit of the entire inode */ | 1438 | /* Note: we always request a commit of the entire inode */ |