Merge branch 'writeback'

diff --cc fs/nfs/dir.c
Simple merge

diff --cc fs/nfs/direct.c
Simple merge

diff --cc fs/nfs/file.c
Simple merge

diff --cc fs/nfs/inode.c
Simple merge

diff --cc fs/nfs/internal.h
index f7e33a5984d803497f2a538cea19244e9c843fb7,3b01c9146e156512056b7036aca598f2f99e9869..8de509b65e8db8513aa20698169e09c105207372
--- 1/fs/nfs/internal.h
--- 2/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@@ -497,9 -509,29 +510,29 @@@ void nfs_init_cinfo(struct nfs_commit_i
                    struct inode *inode,
                    struct nfs_direct_req *dreq);
  int nfs_key_timeout_notify(struct file *filp, struct inode *inode);
 -bool nfs_ctx_key_to_expire(struct nfs_open_context *ctx);
 +bool nfs_ctx_key_to_expire(struct nfs_open_context *ctx, struct inode *inode);
  void nfs_pageio_stop_mirroring(struct nfs_pageio_descriptor *pgio);
  
+ int nfs_filemap_write_and_wait_range(struct address_space *mapping,
+               loff_t lstart, loff_t lend);
+ 
+ #ifdef CONFIG_NFS_V4_1
+ static inline
+ void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo)
+ {
+       int i;
+ 
+       for (i = 0; i < cinfo->nbuckets; i++)
+               cinfo->buckets[i].direct_verf.committed = NFS_INVALID_STABLE_HOW;
+ }
+ #else
+ static inline
+ void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo)
+ {
+ }
+ #endif
+ 
+ 
  #ifdef CONFIG_MIGRATION
  extern int nfs_migrate_page(struct address_space *,
                struct page *, struct page *, enum migrate_mode);

diff --cc fs/nfs/pnfs.c
Simple merge

diff --cc fs/nfs/pnfs_nfs.c
Simple merge

diff --cc fs/nfs/write.c
Simple merge