summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_aops.h
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2016-03-07 09:34:02 +1100
committerDave Chinner <david@fromorbit.com>2016-03-07 09:34:02 +1100
commit3d93ec03648dfbe0f6772b906c8d27a4feaee75f (patch)
tree55a72371b6ff0fbed76fd2a8307e23629094a45f /fs/xfs/xfs_aops.h
parent7f0ed5461a6f5e4ccd2a3ca1047edbe4bbe217fc (diff)
parent0df61da8ac5b7acb1db6cee142822ebe4724c739 (diff)
downloadlinux-3d93ec03648dfbe0f6772b906c8d27a4feaee75f.tar.bz2
Merge branch 'xfs-writepage-rework-4.6' into for-next
Diffstat (limited to 'fs/xfs/xfs_aops.h')
-rw-r--r--fs/xfs/xfs_aops.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/xfs_aops.h b/fs/xfs/xfs_aops.h
index f6ffc9ae5ceb..4e01bd5b6426 100644
--- a/fs/xfs/xfs_aops.h
+++ b/fs/xfs/xfs_aops.h
@@ -24,12 +24,14 @@ extern mempool_t *xfs_ioend_pool;
* Types of I/O for bmap clustering and I/O completion tracking.
*/
enum {
+ XFS_IO_INVALID, /* initial state */
XFS_IO_DELALLOC, /* covers delalloc region */
XFS_IO_UNWRITTEN, /* covers allocated but uninitialized data */
XFS_IO_OVERWRITE, /* covers already allocated extent */
};
#define XFS_IO_TYPES \
+ { XFS_IO_INVALID, "invalid" }, \
{ XFS_IO_DELALLOC, "delalloc" }, \
{ XFS_IO_UNWRITTEN, "unwritten" }, \
{ XFS_IO_OVERWRITE, "overwrite" }
@@ -39,7 +41,7 @@ enum {
* It can manage several multi-page bio's at once.
*/
typedef struct xfs_ioend {
- struct xfs_ioend *io_list; /* next ioend in chain */
+ struct list_head io_list; /* next ioend in chain */
unsigned int io_type; /* delalloc / unwritten */
int io_error; /* I/O error code */
atomic_t io_remaining; /* hold count */