diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2011-06-30 03:44:45 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-06-30 03:44:45 +0200 |
| commit | 275d3ba6b40d0f098693b9089c6fee9bd4e55d74 (patch) | |
| tree | 0f78d9bc4fe10424a692370655d27ee6f509a470 /fs/ext4/page-io.c | |
| parent | ext4: quiet 'unused variables' compile warnings (diff) | |
| download | linux-275d3ba6b40d0f098693b9089c6fee9bd4e55d74.tar.xz linux-275d3ba6b40d0f098693b9089c6fee9bd4e55d74.zip | |
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 '')
| -rw-r--r-- | fs/ext4/page-io.c | 6 |
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, 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; |