projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into perfcounters/core
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nilfs2
/
segbuf.c
diff --git
a/fs/nilfs2/segbuf.c
b/fs/nilfs2/segbuf.c
index 9e3fe17bb96bcb86ec786a4469d659b9554ae399..e6d9e37fa241784c62400c0d4493185de97dd654 100644
(file)
--- a/
fs/nilfs2/segbuf.c
+++ b/
fs/nilfs2/segbuf.c
@@
-316,10
+316,10
@@
static struct bio *nilfs_alloc_seg_bio(struct super_block *sb, sector_t start,
{
struct bio *bio;
{
struct bio *bio;
- bio = bio_alloc(GFP_NO
WAIT
, nr_vecs);
+ bio = bio_alloc(GFP_NO
IO
, nr_vecs);
if (bio == NULL) {
while (!bio && (nr_vecs >>= 1))
if (bio == NULL) {
while (!bio && (nr_vecs >>= 1))
- bio = bio_alloc(GFP_NO
WAIT
, nr_vecs);
+ bio = bio_alloc(GFP_NO
IO
, nr_vecs);
}
if (likely(bio)) {
bio->bi_bdev = sb->s_bdev;
}
if (likely(bio)) {
bio->bi_bdev = sb->s_bdev;