iomap: remove IOMAP_F_ZONE_APPEND

No users left now that btrfs takes REQ_OP_WRITE bios from iomap and
splits and converts them to REQ_OP_ZONE_APPEND internally.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 9804714b17518e2716642e03fc0c8a708d722490..f771001574d008fd9c138d5a985cf13b2eda9f9e 100644 (file)
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -217,16 +217,10 @@ static inline blk_opf_t iomap_dio_bio_opflags(struct iomap_dio *dio,
 {
        blk_opf_t opflags = REQ_SYNC | REQ_IDLE;
 
-       if (!(dio->flags & IOMAP_DIO_WRITE)) {
-               WARN_ON_ONCE(iomap->flags & IOMAP_F_ZONE_APPEND);
+       if (!(dio->flags & IOMAP_DIO_WRITE))
                return REQ_OP_READ;
-       }
-
-       if (iomap->flags & IOMAP_F_ZONE_APPEND)
-               opflags |= REQ_OP_ZONE_APPEND;
-       else
-               opflags |= REQ_OP_WRITE;
 
+       opflags |= REQ_OP_WRITE;
        if (use_fua)
                opflags |= REQ_FUA;
        else

diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 0983dfc9a203c39572d33320210d15f3f21cf138..fca43a4bd96b778c2614f9e5315adbf8426e06a3 100644 (file)
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -58,8 +58,7 @@ struct vm_fault;
 #define IOMAP_F_SHARED         (1U << 2)
 #define IOMAP_F_MERGED         (1U << 3)
 #define IOMAP_F_BUFFER_HEAD    (1U << 4)
-#define IOMAP_F_ZONE_APPEND    (1U << 5)
-#define IOMAP_F_XATTR          (1U << 6)
+#define IOMAP_F_XATTR          (1U << 5)
 
 /*
  * Flags set by the core iomap code during operations: