projects/linux·commit 3eb07d20

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

3eb07d20 · Linus Torvalds <[email protected]> · 2019-02-28 15:22:59 -08:00

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...
Commit
3eb07d206dafc2579a2fc684338b19a209b7fc18
Parents
3a8ed368 · 6e356d45

Merge commit. Changes below are compared with the first parent: 3a8ed368.

Changes

1 files changed · +0 −4

FileStatusAddDelContent
fs/orangefs/file.cmodified+0−4View file

fs/orangefs/file.c

View file
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index a5a2fe7..b094d3d 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -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);