diff mbox

ext4: retry failed direct IO allocations

Message ID 4AC6810F.9020600@redhat.com
State Accepted, archived
Headers show

Commit Message

Eric Sandeen Oct. 2, 2009, 10:39 p.m. UTC
On a 256M filesystem, doing this in a loop:

        xfs_io -F -f -d -c 'pwrite 0 64m' test
        rm -f test

eventually leads to ENOSPC.  (the xfs_io command does a
64m direct IO write to the file "test")

As with other block allocation callers, it looks like we need to
potentially retry the allocations on the initial ENOSPC.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---


--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Theodore Ts'o Oct. 3, 2009, 2:04 a.m. UTC | #1
On Fri, Oct 02, 2009 at 05:39:11PM -0500, Eric Sandeen wrote:
> On a 256M filesystem, doing this in a loop:
>
>        xfs_io -F -f -d -c 'pwrite 0 64m' test
>        rm -f test
>
> eventually leads to ENOSPC.  (the xfs_io command does a
> 64m direct IO write to the file "test")
>
> As with other block allocation callers, it looks like we need to
> potentially retry the allocations on the initial ENOSPC.
>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Thanks, added to the ext4 patch queue.

						- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 4abd683..098c466 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3291,6 +3291,7 @@  static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb,
 	ssize_t ret;
 	int orphan = 0;
 	size_t count = iov_length(iov, nr_segs);
+	int retries = 0;
 
 	if (rw == WRITE) {
 		loff_t final_size = offset + count;
@@ -3313,9 +3314,12 @@  static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb,
 		}
 	}
 
+retry:
 	ret = blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
 				 offset, nr_segs,
 				 ext4_get_block, NULL);
+	if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
+		goto retry;
 
 	if (orphan) {
 		int err;