From fcce413e9fcc5582d6ec79880375fbcf93119d91 Mon Sep 17 00:00:00 2001 From: Fred Isaman Date: Fri, 20 Apr 2012 14:47:55 -0400 Subject: [PATCH] --- yaml --- r: 308553 b: refs/heads/master c: b359f9d09bcbaede09243cfe844172ba055d89fd h: refs/heads/master i: 308551: 9032da544786086e90b95ff77396bbc788f3a20f v: v3 --- [refs] | 2 +- trunk/fs/nfs/write.c | 2 ++ trunk/include/linux/nfs_xdr.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f79b1486ac9d..0377dc7a691d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f453a54a01c7c0453ad9550906e3d2663dd486ac +refs/heads/master: b359f9d09bcbaede09243cfe844172ba055d89fd diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index 333d01d26292..44a93d8c7b52 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -506,6 +506,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->completion_ops = &nfs_commit_completion_ops; } @@ -1431,6 +1432,7 @@ void nfs_init_commit(struct nfs_commit_data *data, data->lseg = lseg; /* reference transferred */ data->mds_ops = &nfs_commit_ops; data->completion_ops = cinfo->completion_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/trunk/include/linux/nfs_xdr.h b/trunk/include/linux/nfs_xdr.h index 0e8b88ad9ae2..5f563bd113e8 100644 --- a/trunk/include/linux/nfs_xdr.h +++ b/trunk/include/linux/nfs_xdr.h @@ -1274,6 +1274,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 *completion_ops; };