Need this to pass into nfs_commitdata_init, in order to keep data->dreq
accurate.
Signed-off-by: Fred Isaman <iisaman@xxxxxxxxxx>
---
fs/nfs/write.c | 2 ++
include/linux/nfs_xdr.h | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index ceb3979..fe8224c 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -500,6 +500,7 @@ static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,
cinfo->lock = &inode->i_lock;
cinfo->mds = &NFS_I(inode)->commit_info;
cinfo->ds = pnfs_get_ds_info(inode);
+ cinfo->dreq = NULL;
cinfo->compl_ops = &nfs_commit_compl_ops;
}
@@ -1429,6 +1430,7 @@ void nfs_init_commit(struct nfs_commit_data *data,
data->lseg = lseg; /* reference transferred */
data->mds_ops = &nfs_commit_ops;
data->compl_ops = cinfo->compl_ops;
+ data->dreq = cinfo->dreq;
data->args.fh = NFS_FH(data->inode);
/* 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 0ee7b3a..5297f4f 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1269,6 +1269,7 @@ struct nfs_commit_info {
spinlock_t *lock;
struct nfs_mds_commit_info *mds;
struct pnfs_ds_commit_info *ds;
+ struct nfs_direct_req *dreq; /* O_DIRECT request */
const struct nfs_commit_completion_ops *compl_ops;
};
--
1.7.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
