Home| summaryrefslogtreecommitdiff |
| author | David Sterba <dsterba@suse.cz> | 2012-03-23 23:57:07 (GMT) |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2012-03-23 23:57:07 (GMT) |
| commit | d97ade6b368a2df016856cf3a396bba01215e2fd (patch) (side-by-side diff) | |
| tree | e4840a7b501149fe146ea2c32a02286c59d6efcc | |
| parent | 6c5f5ef960fe598a5ca5eb709fc6582761e3b6b1 (diff) | |
- Refresh patches.suse/btrfs-handle-EIO.
- Refresh
patches.suse/btrfs-volumes-schedule_bio-should-return-void.
| -rw-r--r-- | patches.suse/btrfs-handle-EIO | 2 | ||||
| -rw-r--r-- | patches.suse/btrfs-volumes-schedule_bio-should-return-void | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/patches.suse/btrfs-handle-EIO b/patches.suse/btrfs-handle-EIO index 60a179f..39fba00 100644 --- a/patches.suse/btrfs-handle-EIO +++ b/patches.suse/btrfs-handle-EIO @@ -1907,7 +1907,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> */ ret = btrfs_split_item(trans, root, path, &key, offset); - BUG_ON(ret && ret != -EAGAIN); -+ if (ret) { ++ if (ret && ret != -EAGAIN) { + btrfs_abort_transaction(trans, root, ret); + goto out; + } diff --git a/patches.suse/btrfs-volumes-schedule_bio-should-return-void b/patches.suse/btrfs-volumes-schedule_bio-should-return-void index efdd27b..0f173a8 100644 --- a/patches.suse/btrfs-volumes-schedule_bio-should-return-void +++ b/patches.suse/btrfs-volumes-schedule_bio-should-return-void @@ -21,15 +21,16 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> struct btrfs_device *device, int rw, struct bio *bio) { -@@ -3977,7 +3977,6 @@ static noinline int schedule_bio(struct +@@ -3977,7 +3977,7 @@ static noinline int schedule_bio(struct bio_get(bio); btrfsic_submit_bio(rw, bio); bio_put(bio); - return 0; ++ return; } /* -@@ -4011,7 +4010,6 @@ static noinline int schedule_bio(struct +@@ -4011,7 +4011,6 @@ static noinline int schedule_bio(struct if (should_queue) btrfs_queue_worker(&root->fs_info->submit_workers, &device->work); |