Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2012-03-24 00:57:07 +0100
committerDavid Sterba <dsterba@suse.cz>2012-03-24 00:57:07 +0100
commitd97ade6b368a2df016856cf3a396bba01215e2fd (patch)
treee4840a7b501149fe146ea2c32a02286c59d6efcc
parent6c5f5ef960fe598a5ca5eb709fc6582761e3b6b1 (diff)
- Refresh patches.suse/btrfs-handle-EIO.
- Refresh patches.suse/btrfs-volumes-schedule_bio-should-return-void.
-rw-r--r--patches.suse/btrfs-handle-EIO2
-rw-r--r--patches.suse/btrfs-volumes-schedule_bio-should-return-void5
2 files changed, 4 insertions, 3 deletions
diff --git a/patches.suse/btrfs-handle-EIO b/patches.suse/btrfs-handle-EIO
index 60a179f225..39fba005fd 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 efdd27bf5d..0f173a8fd3 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);