Attachment 299789 Details for Bug 439918 – patch to fix dio error path

[patch] patch to fix dio error path

linux-2.6.18-direct-io-fix-error-path-crashes.patch (text/plain), 1.32 KB, created by Greg Marsden on 2008-03-31 23:21:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Marsden

Created: 2008-03-31 23:21:14 UTC

Size: 1.32 KB

patch

obsolete

>--- linux-2.6.18.x86_64/fs/direct-io.c.orig	2007-08-20 17:04:36.000000000 -0700
>+++ linux-2.6.18.x86_64/fs/direct-io.c	2007-08-20 19:14:52.000000000 -0700
>@@ -948,35 +948,21 @@
> 	ssize_t ret2;
> 	size_t bytes;
> 
>-	dio->bio = NULL;
> 	dio->inode = inode;
> 	dio->rw = rw;
> 	dio->blkbits = blkbits;
> 	dio->blkfactor = inode->i_blkbits - blkbits;
>-	dio->start_zero_done = 0;
>-	dio->size = 0;
> 	dio->block_in_file = offset >> blkbits;
>-	dio->blocks_available = 0;
>-	dio->cur_page = NULL;
>-
>-	dio->boundary = 0;
>-	dio->reap_counter = 0;
> 	dio->get_block = get_block;
> 	dio->end_io = end_io;
>-	dio->map_bh.b_private = NULL;
> 	dio->final_block_in_bio = -1;
> 	dio->next_block_for_io = -1;
> 
>-	dio->page_errors = 0;
>-	dio->io_error = 0;
>-	dio->result = 0;
> 	dio->iocb = iocb;
> 	dio->i_size = i_size_read(inode);
> 
> 	atomic_set(&dio->refcount, 1);
> 	spin_lock_init(&dio->bio_lock);
>-	dio->bio_list = NULL;
>-	dio->waiter = NULL;
> 
> 	/*
> 	 * In case of non-aligned buffers, we may need 2 more
>@@ -984,8 +970,6 @@
> 	 */
> 	if (unlikely(dio->blkfactor))
> 		dio->pages_in_io = 2;
>-	else
>-		dio->pages_in_io = 0;
> 
> 	for (seg = 0; seg < nr_segs; seg++) {
> 		user_addr = (unsigned long)iov[seg].iov_base;
>@@ -1165,7 +1149,7 @@
> 		}
> 	}
> 
>-	dio = kmalloc(sizeof(*dio), GFP_KERNEL);
>+	dio = kzalloc(sizeof(*dio), GFP_KERNEL);
> 	retval = -ENOMEM;
> 	if (!dio)
> 		goto out;

Actions: View | Diff

Attachments on bug 439918: 299789