Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Iliopoulos <ailiopoulos@suse.com>2019-06-12 16:20:19 +0200
committerAnthony Iliopoulos <ailiopoulos@suse.com>2019-06-12 16:20:19 +0200
commitac8a63b2c5acf6a2dcd4d9e2730a89321804b51e (patch)
treea857cf0cd17140ae17e03a4f788891a9191cbfe1
parenta20daf378483ef66076a44c56c5e33eb2750029e (diff)
xfs: remove XFS_IO_INVALID (bsc#1138017).
-rw-r--r--patches.fixes/xfs-remove-XFS_IO_INVALID.patch79
-rw-r--r--series.conf1
2 files changed, 80 insertions, 0 deletions
diff --git a/patches.fixes/xfs-remove-XFS_IO_INVALID.patch b/patches.fixes/xfs-remove-XFS_IO_INVALID.patch
new file mode 100644
index 0000000000..9c99f252b0
--- /dev/null
+++ b/patches.fixes/xfs-remove-XFS_IO_INVALID.patch
@@ -0,0 +1,79 @@
+From 97e5a6e6dc44b9ea660f85de084f6e38cb5cf39c Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Thu, 18 Oct 2018 17:17:50 +1100
+Subject: [PATCH] xfs: remove XFS_IO_INVALID
+Git-commit: 97e5a6e6dc44b9ea660f85de084f6e38cb5cf39c
+Patch-mainline: v4.20-rc1
+References: bsc#1138017
+
+The invalid state isn't any different from a hole, so merge the two
+states. Use the more descriptive hole name, but keep it as the first
+value of the enum to catch uninitialized fields.
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Brian Foster <bfoster@redhat.com>
+Signed-off-by: Dave Chinner <david@fromorbit.com>
+Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>
+
+---
+ fs/xfs/xfs_aops.c | 4 ++--
+ fs/xfs/xfs_aops.h | 14 ++++++--------
+ 2 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
+index 49f5f5896a43..338b9d9984e0 100644
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@ -917,7 +917,7 @@ xfs_vm_writepage(
+ struct writeback_control *wbc)
+ {
+ struct xfs_writepage_ctx wpc = {
+- .io_type = XFS_IO_INVALID,
++ .io_type = XFS_IO_HOLE,
+ };
+ int ret;
+
+@@ -933,7 +933,7 @@ xfs_vm_writepages(
+ struct writeback_control *wbc)
+ {
+ struct xfs_writepage_ctx wpc = {
+- .io_type = XFS_IO_INVALID,
++ .io_type = XFS_IO_HOLE,
+ };
+ int ret;
+
+diff --git a/fs/xfs/xfs_aops.h b/fs/xfs/xfs_aops.h
+index 9af867951a10..494b4338446e 100644
+--- a/fs/xfs/xfs_aops.h
++++ b/fs/xfs/xfs_aops.h
+@@ -12,21 +12,19 @@ extern struct bio_set xfs_ioend_bioset;
+ * Types of I/O for bmap clustering and I/O completion tracking.
+ */
+ enum {
+- XFS_IO_INVALID, /* initial state */
++ XFS_IO_HOLE, /* covers region without any block allocation */
+ XFS_IO_DELALLOC, /* covers delalloc region */
+ XFS_IO_UNWRITTEN, /* covers allocated but uninitialized data */
+ XFS_IO_OVERWRITE, /* covers already allocated extent */
+ XFS_IO_COW, /* covers copy-on-write extent */
+- XFS_IO_HOLE, /* covers region without any block allocation */
+ };
+
+ #define XFS_IO_TYPES \
+- { XFS_IO_INVALID, "invalid" }, \
+- { XFS_IO_DELALLOC, "delalloc" }, \
+- { XFS_IO_UNWRITTEN, "unwritten" }, \
+- { XFS_IO_OVERWRITE, "overwrite" }, \
+- { XFS_IO_COW, "CoW" }, \
+- { XFS_IO_HOLE, "hole" }
++ { XFS_IO_HOLE, "hole" }, \
++ { XFS_IO_DELALLOC, "delalloc" }, \
++ { XFS_IO_UNWRITTEN, "unwritten" }, \
++ { XFS_IO_OVERWRITE, "overwrite" }, \
++ { XFS_IO_COW, "CoW" }
+
+ /*
+ * Structure for buffered I/O completions.
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 82a344f32f..86a7422f9e 100644
--- a/series.conf
+++ b/series.conf
@@ -19647,6 +19647,7 @@
patches.suse/btrfs-fix-wrong-dentries-after-fsync-of-file-that-go.patch
patches.fixes/gfs2_meta-mount-can-get-NULL-dev_name.patch
patches.fixes/gfs2-Don-t-leave-s_fs_info-pointing-to-freed-memory-.patch
+ patches.fixes/xfs-remove-XFS_IO_INVALID.patch
patches.fixes/xfs-Fix-xqmstats-offsets-in-proc-fs-xfs-xqmstat.patch
patches.fixes/ext4-fix-EXT4_IOC_SWAP_BOOT.patch
patches.fixes/ext4-initialize-retries-variable-in-ext4_da_write_in.patch