diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-12-10 08:42:17 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-12-16 16:05:40 -0600 |
| commit | 221cb2517e8fc9a1d67c7a8a9c19fc5a916b583f (patch) | |
| tree | 891f7a8f1063f862a8c4d76882a0606191813fca | |
| parent | 85da94c6b4666582c38579ccdcd90a5d9b5697ef (diff) | |
| download | kernel_samsung_smdk4412-221cb2517e8fc9a1d67c7a8a9c19fc5a916b583f.zip kernel_samsung_smdk4412-221cb2517e8fc9a1d67c7a8a9c19fc5a916b583f.tar.gz kernel_samsung_smdk4412-221cb2517e8fc9a1d67c7a8a9c19fc5a916b583f.tar.bz2 | |
xfs: remove some dead bio handling code
We'll never have BIO_EOPNOTSUPP set after calling submit_bio as this
can only happen for discards, and used to happen for barriers, none
of which is every submitted by xfs_submit_ioend_bio. Also remove
the loop around bio_alloc as it will never fail due to it's mempool
backing.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 23a7668..ca67ae9 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c @@ -380,26 +380,18 @@ xfs_submit_ioend_bio( submit_bio(wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC_PLUG : WRITE, bio); - ASSERT(!bio_flagged(bio, BIO_EOPNOTSUPP)); - bio_put(bio); } STATIC struct bio * xfs_alloc_ioend_bio( struct buffer_head *bh) { - struct bio *bio; int nvecs = bio_get_nr_vecs(bh->b_bdev); - - do { - bio = bio_alloc(GFP_NOIO, nvecs); - nvecs >>= 1; - } while (!bio); + struct bio *bio = bio_alloc(GFP_NOIO, nvecs); ASSERT(bio->bi_private == NULL); bio->bi_sector = bh->b_blocknr * (bh->b_size >> 9); bio->bi_bdev = bh->b_bdev; - bio_get(bio); return bio; } @@ -470,9 +462,8 @@ xfs_submit_ioend( /* Pass 1 - start writeback */ do { next = ioend->io_list; - for (bh = ioend->io_buffer_head; bh; bh = bh->b_private) { + for (bh = ioend->io_buffer_head; bh; bh = bh->b_private) xfs_start_buffer_writeback(bh); - } } while ((ioend = next) != NULL); /* Pass 2 - submit I/O */ |