summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 17:07:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 17:07:56 -0700
commit04cc69768e7d1f40d98b79d23d203674553b4da2 (patch)
treef4cdfae416f7d63f2dc7a2dc2d4ed94250ea3de1 /fs
parenta2887097f25cd38cadfc11d10769e2b349fb5eca (diff)
parente5953cbdff26f7cbae7eff30cd9b18c4e19b7594 (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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index 279eef96c51c..37eb1ebeaa90 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;
}