From: Damien Le Moal damien.lemoal@opensource.wdc.com

The call to invalidate_inode_pages2_range() in __iomap_dio_rw() may fail, in which case -ENOTBLK is returned and this error code is propagated back to user space trhough iomap_dio_rw() -> zonefs_file_dio_write() return chain. This error code is fairly obscure and may confuse the user. Avoid this and be consistent with the behavior of zonefs_file_dio_append() for similar invalidate_inode_pages2_range() errors by returning -EBUSY to user space when iomap_dio_rw() returns -ENOTBLK.

Suggested-by: Christoph Hellwig hch@infradead.org Fixes: 8dcc1a9d90c1 ("fs: New zonefs file system") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal damien.lemoal@opensource.wdc.com Reviewed-by: Christoph Hellwig hch@lst.de Reviewed-by: Johannes Thumshirn johannes.thumshirn@wdc.com Tested-by: Hans Holmberg hans.holmberg@wdc.com (cherry picked from commit 77af13ba3c7f91d91c377c7e2d122849bbc17128)

Orabug: 35351356

Signed-off-by: Himanshu Madhani himanshu.madhani@oracle.com

Conflicts: fs/zonefs/file.c

small conflicts due to old api for iomap_dio_rw() --- fs/zonefs/file.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/fs/zonefs/file.c b/fs/zonefs/file.c index 49b934c98c5a..27cd84c5e5d0 100644 --- a/fs/zonefs/file.c +++ b/fs/zonefs/file.c @@ -583,11 +583,20 @@ static ssize_t zonefs_file_dio_write(struct kiocb *iocb, struct iov_iter *from) append = sync; }

- if (append) + if (append) { ret = zonefs_file_dio_append(iocb, from); - else + } else { + /* + * iomap_dio_rw() may return ENOTBLK if there was an issue with + * page invalidation. Overwrite that error code with EBUSY to + * be consistent with zonefs_file_dio_append() return value for + * similar issues. + */ ret = iomap_dio_rw(iocb, from, &zonefs_write_iomap_ops, &zonefs_write_dio_ops, 0, 0); + if (ret == -ENOTBLK) + ret = -EBUSY; + }

if (zonefs_zone_is_seq(z) && (ret > 0 || ret == -EIOCBQUEUED)) {