projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
trace
/
blktrace.c
diff --git
a/kernel/trace/blktrace.c
b/kernel/trace/blktrace.c
index b3e6b39b6cf92bc48da96ea7ca2f899d32e427ac..90e72a0c3047990ebd9296e2c016ebb81089cfcd 100644
(file)
--- a/
kernel/trace/blktrace.c
+++ b/
kernel/trace/blktrace.c
@@
-778,9
+778,6
@@
static void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
if (likely(!bt))
return;
if (likely(!bt))
return;
- if (!error && !bio_flagged(bio, BIO_UPTODATE))
- error = EIO;
-
__blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
bio->bi_rw, what, error, 0, NULL);
}
__blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
bio->bi_rw, what, error, 0, NULL);
}
@@
-887,8
+884,7
@@
static void blk_add_trace_split(void *ignore,
__blk_add_trace(bt, bio->bi_iter.bi_sector,
bio->bi_iter.bi_size, bio->bi_rw, BLK_TA_SPLIT,
__blk_add_trace(bt, bio->bi_iter.bi_sector,
bio->bi_iter.bi_size, bio->bi_rw, BLK_TA_SPLIT,
- !bio_flagged(bio, BIO_UPTODATE),
- sizeof(rpdu), &rpdu);
+ bio->bi_error, sizeof(rpdu), &rpdu);
}
}
}
}
@@
-920,8
+916,8
@@
static void blk_add_trace_bio_remap(void *ignore,
r.sector_from = cpu_to_be64(from);
__blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
r.sector_from = cpu_to_be64(from);
__blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
- bio->bi_rw, BLK_TA_REMAP,
-
!bio_flagged(bio, BIO_UPTODATE),
sizeof(r), &r);
+ bio->bi_rw, BLK_TA_REMAP,
bio->bi_error,
+ sizeof(r), &r);
}
/**
}
/**