summaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorNamjae Jeon <namjae.jeon@samsung.com>2012-12-08 14:53:40 +0900
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2012-12-11 13:43:44 +0900
commitc212991a6bc3ba120d41205a294c5b89f05f1535 (patch)
tree1078feaea977a2af0ea6da47c0aec342c2272207 /fs/f2fs
parentd08ab08d140de247eb812ce2c3c4b323620e4609 (diff)
downloadlinux-c212991a6bc3ba120d41205a294c5b89f05f1535.tar.bz2
f2fs: rewrite f2fs_bio_alloc to make it simpler
Since, GFP_NOFS(__GFP_WAIT) is used for allocation requests of bio in f2fs. So, there is no chance of returning NULL from the BIO allocation. Making the bio allocation routine for f2fs simpler. Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Amit Sahrawat <a.sahrawat@samsung.com>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/segment.c24
1 files changed, 7 insertions, 17 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 969df1a30d1c..8894b399770d 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -647,28 +647,18 @@ struct bio *f2fs_bio_alloc(struct block_device *bdev, sector_t first_sector,
int nr_vecs, gfp_t gfp_flags)
{
struct bio *bio;
-repeat:
+
/* allocate new bio */
bio = bio_alloc(gfp_flags, nr_vecs);
- if (bio == NULL && (current->flags & PF_MEMALLOC)) {
- while (!bio && (nr_vecs /= 2))
- bio = bio_alloc(gfp_flags, nr_vecs);
- }
- if (bio) {
- bio->bi_bdev = bdev;
- bio->bi_sector = first_sector;
+ bio->bi_bdev = bdev;
+ bio->bi_sector = first_sector;
retry:
- bio->bi_private = kmalloc(sizeof(struct bio_private),
- GFP_NOFS | __GFP_HIGH);
- if (!bio->bi_private) {
- cond_resched();
- goto retry;
- }
- }
- if (bio == NULL) {
+ bio->bi_private = kmalloc(sizeof(struct bio_private),
+ GFP_NOFS | __GFP_HIGH);
+ if (!bio->bi_private) {
cond_resched();
- goto repeat;
+ goto retry;
}
return bio;
}