diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2010-09-27 13:29:00 -0400 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2010-09-27 13:29:00 -0400 |
| commit | 9d54ccf27df6b22bf994917b21d0a7c055d30d6a (patch) | |
| tree | 91ca96f37eff934e192d47a56ce1223cbaac1660 | |
| parent | 220e20910446626b399bc5e148be5c946eace449 (diff) | |
| download | dom0-kernel-9d54ccf27df6b22bf994917b21d0a7c055d30d6a.tar.gz dom0-kernel-9d54ccf27df6b22bf994917b21d0a7c055d30d6a.tar.xz dom0-kernel-9d54ccf27df6b22bf994917b21d0a7c055d30d6a.zip | |
drop linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch, upstream in 2.6.32
| -rw-r--r-- | kernel.spec | 4 | ||||
| -rw-r--r-- | linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch | 48 |
2 files changed, 0 insertions, 52 deletions
diff --git a/kernel.spec b/kernel.spec index 93a05a9..e20e8a0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -776,7 +776,6 @@ Patch11010: via-hwmon-temp-sensor.patch # patches headed upstream Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch -Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch Patch12013: linux-2.6-rfkill-all.patch Patch12020: linux-2.6-cantiga-iommu-gfx.patch @@ -1444,9 +1443,6 @@ ApplyPatch crystalhd-2.6.34-staging.patch # Assorted Virt Fixes -# Fix block I/O errors in KVM -#ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch - ApplyPatch linux-2.6-e1000-ich9.patch ApplyPatch linux-2.6-phylib-autoload.patch diff --git a/linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch b/linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch deleted file mode 100644 index e6ab893..0000000 --- a/linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Mark McLoughlin <markmc@redhat.com> -Subject: [PATCH] block: silently error unsupported empty barriers too - -With 2.6.31-rc5 in a KVM guest using dm and virtio_blk, we see the -following errors: - - end_request: I/O error, dev vda, sector 0 - end_request: I/O error, dev vda, sector 0 - -The errors go away if dm stops submitting empty barriers, by reverting: - - commit 52b1fd5a27c625c78373e024bf570af3c9d44a79 - Author: Mikulas Patocka <mpatocka@redhat.com> - dm: send empty barriers to targets in dm_flush - -We should error all barriers, even empty barriers, on devices like -virtio_blk which don't support them. - -See also: - - https://bugzilla.redhat.com/514901 - -Signed-off-by: Mark McLoughlin <markmc@redhat.com> -Cc: Rusty Russell <rusty@rustcorp.com.au> -Cc: Mikulas Patocka <mpatocka@redhat.com> -Cc: Alasdair G Kergon <agk@redhat.com> -Cc: Neil Brown <neilb@suse.de> ---- - block/blk-core.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/block/blk-core.c b/block/blk-core.c -index e3299a7..35ad2bb 100644 ---- a/block/blk-core.c -+++ b/block/blk-core.c -@@ -1163,8 +1163,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) - const int unplug = bio_unplug(bio); - int rw_flags; - -- if (bio_barrier(bio) && bio_has_data(bio) && -- (q->next_ordered == QUEUE_ORDERED_NONE)) { -+ if (bio_barrier(bio) && (q->next_ordered == QUEUE_ORDERED_NONE)) { - bio_endio(bio, -EOPNOTSUPP); - return 0; - } --- -1.6.4 - |