fs: move inode_dio_done to the end_io handler

For filesystems that delay their end_io processing we should keep our
i_dio_count until the the processing is done.  Enable this by moving
the inode_dio_done call to the end_io handler if one exist.  Note that
the actual move to the workqueue for ext4 and XFS is not done in
this patch yet, but left to the filesystem maintainers.  At least
for XFS it's not needed yet either as XFS has an internal equivalent
to i_dio_count.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 4 insertions, 3 deletions

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 0a073c7125a6..01d2d9ef609c 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -293,11 +293,12 @@ static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret, bool is
         if (dio->end_io && dio->result) {
                 dio->end_io(dio->iocb, offset, transferred,
                             dio->map_bh.b_private, ret, is_async);
-        } else if (is_async) {
-                aio_complete(dio->iocb, ret, 0);
+        } else {
+                if (is_async)
+                        aio_complete(dio->iocb, ret, 0);
+                inode_dio_done(dio->inode);
         }
 
-        inode_dio_done(dio->inode);
         return ret;
 }