aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/write.c2
-rw-r--r--include/linux/nfs_xdr.h1
2 files changed, 3 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 */
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 0e8b88ad9ae2..5f563bd113e8 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1274,6 +1274,7 @@ struct nfs_commit_info {
1274 spinlock_t *lock; 1274 spinlock_t *lock;
1275 struct nfs_mds_commit_info *mds; 1275 struct nfs_mds_commit_info *mds;
1276 struct pnfs_ds_commit_info *ds; 1276 struct pnfs_ds_commit_info *ds;
1277 struct nfs_direct_req *dreq; /* O_DIRECT request */
1277 const struct nfs_commit_completion_ops *completion_ops; 1278 const struct nfs_commit_completion_ops *completion_ops;
1278}; 1279};
1279 1280