From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Sun, 24 Jul 2016 21:08:31 +0000 (-0400)
Subject: Merge branch 'writeback'
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~9684^2~6
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=362745268ce119c473952b30f57d947bdede7f7a;p=mirror_ubuntu-focal-kernel.git

Merge branch 'writeback'
---

362745268ce119c473952b30f57d947bdede7f7a
diff --cc fs/nfs/internal.h
index f7e33a5984d8,3b01c9146e15..8de509b65e8d
--- a/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);