Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308553
b: refs/heads/master
c: b359f9d
h: refs/heads/master
i:
  308551: 9032da5
v: v3
  • Loading branch information
Fred Isaman authored and Trond Myklebust committed Apr 27, 2012
1 parent ff3aad7 commit fcce413
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f453a54a01c7c0453ad9550906e3d2663dd486ac
refs/heads/master: b359f9d09bcbaede09243cfe844172ba055d89fd
2 changes: 2 additions & 0 deletions trunk/fs/nfs/write.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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 */
Expand Down
1 change: 1 addition & 0 deletions trunk/include/linux/nfs_xdr.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down

0 comments on commit fcce413

Please sign in to comment.