---

yaml --- r: 262089 b: refs/heads/master c: 275d3ba h: refs/heads/master i: 262087: 42e3902 v: v3
git-mirror · Jun 30, 2011 · 814efe2 · 814efe2
1 parent 7e2793c
commit 814efe2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9331b6261058eb85ae7c57ab8ac279e7fdaa9f04
+refs/heads/master: 275d3ba6b40d0f098693b9089c6fee9bd4e55d74
diff --git a/trunk/fs/ext4/page-io.c b/trunk/fs/ext4/page-io.c
@@ -285,11 +285,7 @@ static int io_submit_init(struct ext4_io_submit *io,
 	io_end = ext4_init_io_end(inode, GFP_NOFS);
 	if (!io_end)
 		return -ENOMEM;
-	do {
-		bio = bio_alloc(GFP_NOIO, nvecs);
-		nvecs >>= 1;
-	} while (bio == NULL);
-
+	bio = bio_alloc(GFP_NOIO, min(nvecs, BIO_MAX_PAGES));
 	bio->bi_sector = bh->b_blocknr * (bh->b_size >> 9);
 	bio->bi_bdev = bh->b_bdev;
 	bio->bi_private = io->io_end = io_end;