Commit b359f9d0 authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust

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: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f453a54a
...@@ -506,6 +506,7 @@ static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo, ...@@ -506,6 +506,7 @@ static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,
cinfo->lock = &inode->i_lock; cinfo->lock = &inode->i_lock;
cinfo->mds = &NFS_I(inode)->commit_info; cinfo->mds = &NFS_I(inode)->commit_info;
cinfo->ds = pnfs_get_ds_info(inode); cinfo->ds = pnfs_get_ds_info(inode);
cinfo->dreq = NULL;
cinfo->completion_ops = &nfs_commit_completion_ops; cinfo->completion_ops = &nfs_commit_completion_ops;
} }
...@@ -1431,6 +1432,7 @@ void nfs_init_commit(struct nfs_commit_data *data, ...@@ -1431,6 +1432,7 @@ void nfs_init_commit(struct nfs_commit_data *data,
data->lseg = lseg; /* reference transferred */ data->lseg = lseg; /* reference transferred */
data->mds_ops = &nfs_commit_ops; data->mds_ops = &nfs_commit_ops;
data->completion_ops = cinfo->completion_ops; data->completion_ops = cinfo->completion_ops;
data->dreq = cinfo->dreq;
data->args.fh = NFS_FH(data->inode); data->args.fh = NFS_FH(data->inode);
/* Note: we always request a commit of the entire inode */ /* Note: we always request a commit of the entire inode */
......
...@@ -1274,6 +1274,7 @@ struct nfs_commit_info { ...@@ -1274,6 +1274,7 @@ struct nfs_commit_info {
spinlock_t *lock; spinlock_t *lock;
struct nfs_mds_commit_info *mds; struct nfs_mds_commit_info *mds;
struct pnfs_ds_commit_info *ds; struct pnfs_ds_commit_info *ds;
struct nfs_direct_req *dreq; /* O_DIRECT request */
const struct nfs_commit_completion_ops *completion_ops; const struct nfs_commit_completion_ops *completion_ops;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment