On Mon, Jun 25, 2012 at 12:38:03PM -0400, Jeff Moyer wrote:
> Please try the attached patch instead. The patch I had originally
> posted for this allowed marking the first buffer beyond EOD as
> uptodate. This isn't correct. The patch I've attached below fixes the
> infinite loop in __getblk_slow.
This patch appears to fix both problems, thanks.
Rich.
> Cheers,
> Jeff
>
> diff --git a/fs/buffer.c b/fs/buffer.c
> index 838a9cf..c7062c8 100644
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@ -1036,6 +1036,9 @@ grow_buffers(struct block_device *bdev, sector_t block, int size)
> static struct buffer_head *
> __getblk_slow(struct block_device *bdev, sector_t block, int size)
> {
> + int ret;
> + struct buffer_head *bh;
> +
> /* Size must be multiple of hard sectorsize */
> if (unlikely(size & (bdev_logical_block_size(bdev)-1) ||
> (size < 512 || size > PAGE_SIZE))) {
> @@ -1048,20 +1051,21 @@ __getblk_slow(struct block_device *bdev, sector_t block, int size)
> return NULL;
> }
>
> - for (;;) {
> - struct buffer_head * bh;
> - int ret;
> +retry:
> + bh = __find_get_block(bdev, block, size);
> + if (bh)
> + return bh;
>
> + ret = grow_buffers(bdev, block, size);
> + if (ret == 0) {
> + free_more_memory();
> + goto retry;
> + } else if (ret > 0) {
> bh = __find_get_block(bdev, block, size);
> if (bh)
> return bh;
> -
> - ret = grow_buffers(bdev, block, size);
> - if (ret < 0)
> - return NULL;
> - if (ret == 0)
> - free_more_memory();
> }
> + return NULL;
> }
>
> /*
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
