Merge tag 'vfs/v6.4-rc1/pipe' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 May 2023 21:56:09 +0000 (16:56 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 May 2023 21:56:09 +0000 (16:56 -0500)
commitdf8c2d13e227e4670ebe777970f89db7802b1f56
tree158c086246111e93bbb92352730c847cffeede46
parent584dc5dbcbcca71cc7ccce9077a1456842c26179
parentc04fe8e32f907ea668f3f802387c1148fdb0e6c9
Merge tag 'vfs/v6.4-rc1/pipe' of gitolite.pub/scm/linux/kernel/git/vfs/vfs

Pull vfs fix from Christian Brauner:
 "During the pipe nonblock rework the check for both O_NONBLOCK and
  IOCB_NOWAIT was dropped. Both checks need to be performed to ensure
  that files without O_NONBLOCK but IOCB_NOWAIT don't block when writing
  to or reading from a pipe.

  This just contains the fix adding the check for IOCB_NOWAIT back in"

* tag 'vfs/v6.4-rc1/pipe' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs:
  pipe: check for IOCB_NOWAIT alongside O_NONBLOCK