diff options
| author | David S. Miller <davem@davemloft.net> | 2021-07-23 15:59:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-23 16:13:06 +0100 |
| commit | 5af84df962dd6699e3972fda7a0c8b579fb3ab04 (patch) | |
| tree | 0a66f54c99c0c0d22588304d030ecb752487dfa1 /fs/zonefs/super.c | |
| parent | 090597b4a9c1b81b03fd7cfb4ba458a0e7a78b31 (diff) | |
| parent | 9f42f674a89200d4f465a7db6070e079f3c6145f (diff) | |
| download | linux-5af84df962dd6699e3972fda7a0c8b579fb3ab04.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts are simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/zonefs/super.c')
| -rw-r--r-- | fs/zonefs/super.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c index dbf03635869c..70055d486bf7 100644 --- a/fs/zonefs/super.c +++ b/fs/zonefs/super.c @@ -705,9 +705,6 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from) return 0; bio = bio_alloc(GFP_NOFS, nr_pages); - if (!bio) - return -ENOMEM; - bio_set_dev(bio, bdev); bio->bi_iter.bi_sector = zi->i_zsector; bio->bi_write_hint = iocb->ki_hint; |