On 9/1/22 16:42, Christoph Hellwig wrote: > No users left now that btrfs takes REQ_OP_WRITE bios from iomap and > splits and converts them to REQ_OP_ZONE_APPEND internally. Hu... I wanted to use that for zonefs for doing ZONE APPEND with AIOs... Need to revisit that code anyway, so fine for now. Reviewed-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx> > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > fs/iomap/direct-io.c | 10 ++-------- > include/linux/iomap.h | 1 - > 2 files changed, 2 insertions(+), 9 deletions(-) > > diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c > index 4eb559a16c9ed..9e883a9f80388 100644 > --- 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 238a03087e17e..ee6d511ef29dd 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -55,7 +55,6 @@ struct vm_fault; > #define IOMAP_F_SHARED 0x04 > #define IOMAP_F_MERGED 0x08 > #define IOMAP_F_BUFFER_HEAD 0x10 > -#define IOMAP_F_ZONE_APPEND 0x20 > > /* > * Flags set by the core iomap code during operations: -- Damien Le Moal Western Digital Research