From: Dave Chinner <david@fromorbit.com>
Date: Sun, 6 Mar 2016 22:34:02 +0000 (+1100)
Subject: Merge branch 'xfs-writepage-rework-4.6' into for-next
X-Git-Tag: v4.13~3402^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3d93ec03648dfbe0f6772b906c8d27a4feaee75f;p=mirror_ubuntu-bionic-kernel.git

Merge branch 'xfs-writepage-rework-4.6' into for-next
---

3d93ec03648dfbe0f6772b906c8d27a4feaee75f
diff --cc fs/xfs/xfs_aops.c
index 14ac9822b303,b125f9019145..75a39a8257ee
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@@ -36,10 -36,17 +36,21 @@@
  #include <linux/pagevec.h>
  #include <linux/writeback.h>
  
 +/* flags for direct write completions */
 +#define XFS_DIO_FLAG_UNWRITTEN	(1 << 0)
 +#define XFS_DIO_FLAG_APPEND	(1 << 1)
 +
+ /*
+  * structure owned by writepages passed to individual writepage calls
+  */
+ struct xfs_writepage_ctx {
+ 	struct xfs_bmbt_irec    imap;
+ 	bool			imap_valid;
+ 	unsigned int		io_type;
+ 	struct xfs_ioend	*ioend;
+ 	sector_t		last_block;
+ };
+ 
  void
  xfs_count_page_state(
  	struct page		*page,