Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eb07d20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.0-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux 

Pull orangefs fixlet from Mike Marshall:
 "Remove two un-needed BUG_ONs"

* tag 'for-linus-5.0-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: remove two un-needed BUG_ONs...
parents 3a8ed368 6e356d45

fs/orangefs/file.c

+0 −4
Original line number Diff line number Diff line
@@ -398,8 +398,6 @@ static ssize_t orangefs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter 
	loff_t pos = iocb->ki_pos;

	ssize_t rc = 0;



	BUG_ON(iocb->private);



	gossip_debug(GOSSIP_FILE_DEBUG, "orangefs_file_read_iter\n");



	orangefs_stats.reads++;
@@ -416,8 +414,6 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, struct iov_iter *ite 
	loff_t pos;

	ssize_t rc;



	BUG_ON(iocb->private);



	gossip_debug(GOSSIP_FILE_DEBUG, "orangefs_file_write_iter\n");



	inode_lock(file->f_mapping->host);