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

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()

Linus Torvalds 14 years ago

parent

a2887097f2 e5953cbdff

commit

04cc69768e

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
fs/pipe.c
							 
								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;
			
				 			}