diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:07:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:07:56 -0700 |
| commit | 04cc69768e7d1f40d98b79d23d203674553b4da2 (patch) | |
| tree | f4cdfae416f7d63f2dc7a2dc2d4ed94250ea3de1 /fs | |
| parent | a2887097f25cd38cadfc11d10769e2b349fb5eca (diff) | |
| parent | e5953cbdff26f7cbae7eff30cd9b18c4e19b7594 (diff) | |
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()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 279eef96c51..37eb1ebeaa9 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -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; } |