korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-28 05:24:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: fs-io: Eliminate GFP_NOFS usage

Browse Source 
GFP_NOFS doesn't ever make sense. If we're allocatingc memory it should
be GFP_NOWAIT if btree locks are held, GFP_KERNEL otherwise.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-05-28 00:59:26 -04:00
parent 78367aaa5a
commit 5718fda0b5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/bcachefs/fs-io.c
View File

@ -1368,7 +1368,7 @@ void bch2_readahead(struct readahead_control *ractl)
BIO_MAX_VECS); BIO_MAX_VECS);
struct bch_read_bio *rbio = struct bch_read_bio *rbio =
rbio_init(bio_alloc_bioset(NULL, n, REQ_OP_READ, rbio_init(bio_alloc_bioset(NULL, n, REQ_OP_READ,
GFP_NOFS, &c->bio_read), GFP_KERNEL, &c->bio_read),
opts); opts);
readpage_iter_advance(&readpages_iter); readpage_iter_advance(&readpages_iter);
@ -1379,6 +1379,7 @@ void bch2_readahead(struct readahead_control *ractl)
bchfs_read(&trans, rbio, inode_inum(inode), bchfs_read(&trans, rbio, inode_inum(inode),
&readpages_iter); &readpages_iter);
bch2_trans_unlock(&trans);
} }
bch2_pagecache_add_put(inode); bch2_pagecache_add_put(inode);
@ -1420,7 +1421,7 @@ static int bch2_read_single_folio(struct folio *folio,
bch2_inode_opts_get(&opts, c, &inode->ei_inode); bch2_inode_opts_get(&opts, c, &inode->ei_inode);
rbio = rbio_init(bio_alloc_bioset(NULL, 1, REQ_OP_READ, GFP_NOFS, &c->bio_read), rbio = rbio_init(bio_alloc_bioset(NULL, 1, REQ_OP_READ, GFP_KERNEL, &c->bio_read),
opts); opts);
rbio->bio.bi_private = &done; rbio->bio.bi_private = &done;
rbio->bio.bi_end_io = bch2_read_single_folio_end_io; rbio->bio.bi_end_io = bch2_read_single_folio_end_io;
@ -1555,7 +1556,7 @@ static void bch2_writepage_io_alloc(struct bch_fs *c,
w->io = container_of(bio_alloc_bioset(NULL, BIO_MAX_VECS, w->io = container_of(bio_alloc_bioset(NULL, BIO_MAX_VECS,
REQ_OP_WRITE, REQ_OP_WRITE,
GFP_NOFS, GFP_KERNEL,
&c->writepage_bioset), &c->writepage_bioset),
struct bch_writepage_io, op.wbio.bio); struct bch_writepage_io, op.wbio.bio);