diff options
Diffstat (limited to 'fs/logfs')
| -rw-r--r-- | fs/logfs/dev_bdev.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c index ea29df36893d..e784a217b500 100644 --- a/fs/logfs/dev_bdev.c +++ b/fs/logfs/dev_bdev.c | |||
| @@ -96,12 +96,11 @@ static int __bdev_writeseg(struct super_block *sb, u64 ofs, pgoff_t index, | |||
| 96 | struct address_space *mapping = super->s_mapping_inode->i_mapping; | 96 | struct address_space *mapping = super->s_mapping_inode->i_mapping; |
| 97 | struct bio *bio; | 97 | struct bio *bio; |
| 98 | struct page *page; | 98 | struct page *page; |
| 99 | struct request_queue *q = bdev_get_queue(sb->s_bdev); | 99 | unsigned int max_pages; |
| 100 | unsigned int max_pages = queue_max_hw_sectors(q) >> (PAGE_SHIFT - 9); | ||
| 101 | int i; | 100 | int i; |
| 102 | 101 | ||
| 103 | if (max_pages > BIO_MAX_PAGES) | 102 | max_pages = min(nr_pages, (size_t) bio_get_nr_vecs(super->s_bdev)); |
| 104 | max_pages = BIO_MAX_PAGES; | 103 | |
| 105 | bio = bio_alloc(GFP_NOFS, max_pages); | 104 | bio = bio_alloc(GFP_NOFS, max_pages); |
| 106 | BUG_ON(!bio); | 105 | BUG_ON(!bio); |
| 107 | 106 | ||
| @@ -191,12 +190,11 @@ static int do_erase(struct super_block *sb, u64 ofs, pgoff_t index, | |||
| 191 | { | 190 | { |
| 192 | struct logfs_super *super = logfs_super(sb); | 191 | struct logfs_super *super = logfs_super(sb); |
| 193 | struct bio *bio; | 192 | struct bio *bio; |
| 194 | struct request_queue *q = bdev_get_queue(sb->s_bdev); | 193 | unsigned int max_pages; |
| 195 | unsigned int max_pages = queue_max_hw_sectors(q) >> (PAGE_SHIFT - 9); | ||
| 196 | int i; | 194 | int i; |
| 197 | 195 | ||
| 198 | if (max_pages > BIO_MAX_PAGES) | 196 | max_pages = min(nr_pages, (size_t) bio_get_nr_vecs(super->s_bdev)); |
| 199 | max_pages = BIO_MAX_PAGES; | 197 | |
| 200 | bio = bio_alloc(GFP_NOFS, max_pages); | 198 | bio = bio_alloc(GFP_NOFS, max_pages); |
| 201 | BUG_ON(!bio); | 199 | BUG_ON(!bio); |
| 202 | 200 | ||