iomap: don't merge ioends with mismatching fs private flag

If the file system set it's private flag on one ioend but not the other
we better don't merge the two.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index b4e309aa1043824cbcafa5fe931b74812c4f22b7..160c184cf86063bed5bbfd59b5bdc562c396e24f 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -1620,8 +1620,8 @@ iomap_ioend_can_merge(struct iomap_ioend *ioend, struct iomap_ioend *next)
                return false;
        if (next->io_flags & IOMAP_F_BOUNDARY)
                return false;
-       if ((ioend->io_flags & IOMAP_F_SHARED) ^
-           (next->io_flags & IOMAP_F_SHARED))
+       if ((ioend->io_flags & (IOMAP_F_SHARED | IOMAP_F_PRIVATE)) !=
+           (next->io_flags & (IOMAP_F_SHARED | IOMAP_F_PRIVATE)))
                return false;
        if ((ioend->io_type == IOMAP_UNWRITTEN) ^
            (next->io_type == IOMAP_UNWRITTEN))