aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2011-06-29 21:44:45 -0400
committerTheodore Ts'o <tytso@mit.edu>2011-06-29 21:44:45 -0400
commit275d3ba6b40d0f098693b9089c6fee9bd4e55d74 (patch)
tree0f78d9bc4fe10424a692370655d27ee6f509a470 /fs/ext4
parent9331b6261058eb85ae7c57ab8ac279e7fdaa9f04 (diff)
ext4: remove loop around bio_alloc()
These days, bio_alloc() is guaranteed to never fail (as long as nvecs is less than BIO_MAX_PAGES), so we don't need the loop around the struct bio allocation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/page-io.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index 7bb8f76d470a..430c401d0895 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -285,11 +285,7 @@ static int io_submit_init(struct ext4_io_submit *io,
285 io_end = ext4_init_io_end(inode, GFP_NOFS); 285 io_end = ext4_init_io_end(inode, GFP_NOFS);
286 if (!io_end) 286 if (!io_end)
287 return -ENOMEM; 287 return -ENOMEM;
288 do { 288 bio = bio_alloc(GFP_NOIO, min(nvecs, BIO_MAX_PAGES));
289 bio = bio_alloc(GFP_NOIO, nvecs);
290 nvecs >>= 1;
291 } while (bio == NULL);
292
293 bio->bi_sector = bh->b_blocknr * (bh->b_size >> 9); 289 bio->bi_sector = bh->b_blocknr * (bh->b_size >> 9);
294 bio->bi_bdev = bh->b_bdev; 290 bio->bi_bdev = bh->b_bdev;
295 bio->bi_private = io->io_end = io_end; 291 bio->bi_private = io->io_end = io_end;