From b8d03ea2a60fa1b5e86ee066439abee94ada36bc Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 24 Mar 2009 16:05:51 +0800
Subject: [PATCH] --- yaml --- r: 141055 b: refs/heads/master c:
 e0dc81bec0927fa0c8aabc521793161909eef7a5 h: refs/heads/master i:   141053:
 efc1e14255bd1b42f2e78c20e3e0214ba7acdacb   141051:
 c2b10da7f0956a950d0af286a49f7c35f95117b3   141047:
 ed38a74377f8838f31aa7ee6a5fad43e2aff2f66   141039:
 15d5f6ff368f3c0e991d76ec114a1f5e46b3e7a0   141023:
 ba49a648d1d72639a314033cd7294146739d6f6c   140991:
 7c6a40f9c7e7cae282fb64c05af80ea3c4b21695   140927:
 d9952022f0fe2fa436730a668f88344eaf543008   140799:
 06625dc8709ea6ea65a3d8baf223351863802427 v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/trace/blktrace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e4723c7e8ab0..c22d5aa2feec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65796348e09880e12b97267d39b8857c758440a6
+refs/heads/master: e0dc81bec0927fa0c8aabc521793161909eef7a5
diff --git a/trunk/kernel/trace/blktrace.c b/trunk/kernel/trace/blktrace.c
index 9af41430ee54..f69f8bd8bef9 100644
--- a/trunk/kernel/trace/blktrace.c
+++ b/trunk/kernel/trace/blktrace.c
@@ -968,7 +968,7 @@ static inline unsigned long long t_sector(const struct trace_entry *ent)
 
 static inline __u16 t_error(const struct trace_entry *ent)
 {
-	return te_blk_io_trace(ent)->sector;
+	return te_blk_io_trace(ent)->error;
 }
 
 static __u64 get_pdu_int(const struct trace_entry *ent)