diff --git a/[refs] b/[refs] index 35f0e9a82826..7a7fdb98bbcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24fc9211f4d48c04882a52e42b21c9b4abc4f9bf +refs/heads/master: 68cd6fa4f3be07ba648e22617dfa16a40d671d19 diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index 3636191c3996..2f80aa50d967 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -567,6 +567,17 @@ int nfs_write_need_commit(struct nfs_write_data *data) } #else +static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo, + struct inode *inode) +{ +} + +void nfs_init_cinfo(struct nfs_commit_info *cinfo, + struct inode *inode, + struct nfs_direct_req *dreq) +{ +} + void nfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg, struct nfs_commit_info *cinfo)