diff options
| author | Gu Zheng <guz.fnst@cn.fujitsu.com> | 2013-07-25 11:30:01 +0800 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:43:56 +0900 |
| commit | d148aa71235487eaf77dfec7cdcba2b99d5eb9eb (patch) | |
| tree | 4d8719dde52b0da7c3aac901cfefbaab9b912256 /fs/f2fs | |
| parent | f91dc469fae2bb06e13511e4c36ddebd4d480f06 (diff) | |
| download | linux-3.10-d148aa71235487eaf77dfec7cdcba2b99d5eb9eb.tar.gz linux-3.10-d148aa71235487eaf77dfec7cdcba2b99d5eb9eb.tar.bz2 linux-3.10-d148aa71235487eaf77dfec7cdcba2b99d5eb9eb.zip | |
f2fs: move bio_private allocation out of f2fs_bio_alloc()
bio->bi_private is not always needed. As in the reading data path,
end_read_io does not need bio_private for further using, so moving
bio_private allocation out of f2fs_bio_alloc(). Alloc it in the
submit_write_page(), and ignore it in the f2fs_readpage().
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/data.c | 1 | ||||
| -rw-r--r-- | fs/f2fs/segment.c | 19 |
2 files changed, 11 insertions, 9 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index dc21f9e604a..317ef263cf7 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -365,7 +365,6 @@ static void read_end_io(struct bio *bio, int err) } unlock_page(page); } while (bvec >= bio->bi_io_vec); - kfree(bio->bi_private); bio_put(bio); } diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index a86d125a988..9b74ae2137d 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -611,18 +611,12 @@ static void f2fs_end_io_write(struct bio *bio, int err) struct bio *f2fs_bio_alloc(struct block_device *bdev, int npages) { struct bio *bio; - struct bio_private *priv; -retry: - priv = kmalloc(sizeof(struct bio_private), GFP_NOFS); - if (!priv) { - cond_resched(); - goto retry; - } /* No failure on bio allocation */ bio = bio_alloc(GFP_NOIO, npages); bio->bi_bdev = bdev; - bio->bi_private = priv; + bio->bi_private = NULL; + return bio; } @@ -681,8 +675,17 @@ static void submit_write_page(struct f2fs_sb_info *sbi, struct page *page, do_submit_bio(sbi, type, false); alloc_new: if (sbi->bio[type] == NULL) { + struct bio_private *priv; +retry: + priv = kmalloc(sizeof(struct bio_private), GFP_NOFS); + if (!priv) { + cond_resched(); + goto retry; + } + sbi->bio[type] = f2fs_bio_alloc(bdev, max_hw_blocks(sbi)); sbi->bio[type]->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr); + sbi->bio[type]->bi_private = priv; /* * The end_io will be assigned at the sumbission phase. * Until then, let bio_add_page() merge consecutive IOs as much |