All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v5 1/2] Return bytes transferred for partial direct I/O
@ 2018-01-19  0:57 Goldwyn Rodrigues
  2018-01-19  0:57 ` [PATCH 2/2] xfs: remove assert to check bytes returned Goldwyn Rodrigues
                   ` (2 more replies)
  0 siblings, 3 replies; 29+ messages in thread
From: Goldwyn Rodrigues @ 2018-01-19  0:57 UTC (permalink / raw)
  To: linux-block; +Cc: linux-fsdevel, darrick.wong, Goldwyn Rodrigues

From: Goldwyn Rodrigues <rgoldwyn@suse.com>

In case direct I/O encounters an error midway, it returns the error.
Instead it should be returning the number of bytes transferred so far.

Test case for filesystems (with ENOSPC):
1. Create an almost full filesystem
2. Create a file, say /mnt/lastfile, until the filesystem is full.
3. Direct write() with count > sizeof /mnt/lastfile.

Result: write() returns -ENOSPC. However, file content has data written
in step 3.

This fixes fstest generic/472.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
 fs/block_dev.c |  2 +-
 fs/direct-io.c |  4 +---
 fs/iomap.c     | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 4a181fcb5175..49d94360bb51 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -409,7 +409,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
 
 	if (!ret)
 		ret = blk_status_to_errno(dio->bio.bi_status);
-	if (likely(!ret))
+	if (likely(dio->size))
 		ret = dio->size;
 
 	bio_put(&dio->bio);
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 3aafb3343a65..0c98b6e65d7c 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -262,8 +262,6 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, unsigned int flags)
 		ret = dio->page_errors;
 	if (ret == 0)
 		ret = dio->io_error;
-	if (ret == 0)
-		ret = transferred;
 
 	if (dio->end_io) {
 		// XXX: ki_pos??
@@ -310,7 +308,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, unsigned int flags)
 	}
 
 	kmem_cache_free(dio_cache, dio);
-	return ret;
+	return transferred ? transferred : ret;
 }
 
 static void dio_aio_complete_work(struct work_struct *work)
diff --git a/fs/iomap.c b/fs/iomap.c
index 47d29ccffaef..cab57d85404e 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -716,23 +716,23 @@ static ssize_t iomap_dio_complete(struct iomap_dio *dio)
 	struct kiocb *iocb = dio->iocb;
 	struct inode *inode = file_inode(iocb->ki_filp);
 	loff_t offset = iocb->ki_pos;
-	ssize_t ret;
+	ssize_t err;
+	ssize_t transferred = dio->size;
 
 	if (dio->end_io) {
-		ret = dio->end_io(iocb,
-				dio->error ? dio->error : dio->size,
+		err = dio->end_io(iocb,
+				transferred ? transferred : dio->error,
 				dio->flags);
 	} else {
-		ret = dio->error;
+		err = dio->error;
 	}
 
-	if (likely(!ret)) {
-		ret = dio->size;
+	if (likely(transferred)) {
 		/* check for short read */
-		if (offset + ret > dio->i_size &&
+		if (offset + transferred > dio->i_size &&
 		    !(dio->flags & IOMAP_DIO_WRITE))
-			ret = dio->i_size - offset;
-		iocb->ki_pos += ret;
+			transferred = dio->i_size - offset;
+		iocb->ki_pos += transferred;
 	}
 
 	/*
@@ -759,7 +759,7 @@ static ssize_t iomap_dio_complete(struct iomap_dio *dio)
 	inode_dio_end(file_inode(iocb->ki_filp));
 	kfree(dio);
 
-	return ret;
+	return transferred ? transferred : err;
 }
 
 static void iomap_dio_complete_work(struct work_struct *work)
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 29+ messages in thread

end of thread, other threads:[~2018-01-25 18:01 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-19  0:57 [PATCH v5 1/2] Return bytes transferred for partial direct I/O Goldwyn Rodrigues
2018-01-19  0:57 ` [PATCH 2/2] xfs: remove assert to check bytes returned Goldwyn Rodrigues
2018-01-19  3:57   ` Dave Chinner
2018-01-19  4:23     ` Raphael Carvalho
2018-01-19  4:51       ` Dave Chinner
2018-01-19  2:13 ` [PATCH v5 1/2] Return bytes transferred for partial direct I/O Al Viro
2018-01-19  3:59   ` Dave Chinner
2018-01-19  6:31     ` Darrick J. Wong
2018-01-19  6:33       ` Al Viro
2018-01-20 19:47         ` Al Viro
2018-01-21  2:57           ` Goldwyn Rodrigues
2018-01-21  2:11 ` Andi Kleen
2018-01-21  2:23   ` Goldwyn Rodrigues
2018-01-21  3:07     ` Jens Axboe
2018-01-21 12:06       ` Goldwyn Rodrigues
2018-01-22 18:08         ` Andi Kleen
2018-01-22 19:10       ` Andreas Dilger
2018-01-22 19:13         ` Jens Axboe
2018-01-23  3:18           ` Goldwyn Rodrigues
2018-01-23  3:28             ` Jens Axboe
2018-01-23  6:35               ` Matthew Wilcox
2018-01-25 18:01                 ` Goldwyn Rodrigues
2018-01-24  0:19               ` Andreas Dilger
2018-01-22 22:25       ` Elliott, Robert (Persistent Memory)
2018-01-22 22:25         ` Elliott, Robert (Persistent Memory)
2018-01-22 23:14         ` Jens Axboe
2018-01-22 23:24           ` Bart Van Assche
2018-01-22 23:24             ` Bart Van Assche
2018-01-22 23:27             ` Jens Axboe

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.