Skip to contentSkip to conversation

Single misc fix for 2.6.37-rc1

GIT PULL Jens Axboe 1 participant 1 message Oct 22, 2010 VFS

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

A recently discovered problem in fs/pipe.c can cause us to lose the error returned from buf-ops->confirm().

Please pull.

git://git.kernel.dk/linux-2.6-block.git for-2.6.37/misc

Nicolas Kaiser (1):

      pipe: fix failure to return error code on ->confirm()
 fs/pipe.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/pipe.c +1 -1
index 279eef9..37eb1eb 100644
@@ -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;
 			}
 
Signature · 1 line
Jens Axboe