projects/linux·commit 45312bd7

Merge tag 'zonefs-5.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs

45312bd7 · Linus Torvalds <[email protected]> · 2021-07-16 11:20:53 -07:00

Pull zonefs fix from Damien Le Moal:
 "A single patch to remove an unnecessary NULL bio check (from
  Xianting)"

* tag 'zonefs-5.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs:
  zonefs: remove redundant null bio check
Commit
45312bd762d37bfc7dda6de8a70bb5604e899015
Parents
786cb0a2 · 2f53d15c

Merge commit. Changes below are compared with the first parent: 786cb0a2.

Changes

1 files changed · +0 −3

FileStatusAddDelContent
fs/zonefs/super.cmodified+0−3View file

fs/zonefs/super.c

View file
diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c
index dbf0363..70055d4 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;