Commit 45312bd7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 786cb0a2 2f53d15c

fs/zonefs/super.c

+0 −3
Original line number Diff line number Diff line
@@ -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;