Merge branch 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block:
  pipe: fix failure to return error code on ->confirm()
This commit is contained in:
Linus Torvalds 2010-10-22 17:07:56 -07:00
commit 04cc69768e

View file

@ -382,7 +382,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
error = ops->confirm(pipe, buf);
if (error) {
if (!ret)
error = ret;
ret = error;
break;
}