X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=fs%2Fdirect-io.c;h=476f1ecbd1f0e585171b8dfa2970ada3cb5cc2c7;hb=14900363454b8244b41f77f42013a22db20bb2e2;hp=0a8d937c6775577d64c40cdaa250cc632619f339;hpb=33b3d2e88c9efd701b6153ca4714d4aa6e9f5af0;p=deliverable%2Flinux.git

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 0a8d937c6775..476f1ecbd1f0 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -253,8 +253,13 @@ static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret,
 	if (ret == 0)
 		ret = transferred;
 
-	if (dio->end_io && dio->result)
-		dio->end_io(dio->iocb, offset, transferred, dio->private);
+	if (dio->end_io) {
+		int err;
+
+		err = dio->end_io(dio->iocb, offset, ret, dio->private);
+		if (err)
+			ret = err;
+	}
 
 	if (!(dio->flags & DIO_SKIP_DIO_COUNT))
 		inode_dio_end(dio->inode);