Home Home > GIT Browse
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
commitd3201337cb0874497a29b8c295bf4a9ced378e1c (patch)
tree4d1d17df4bbbb2698608fdd47926388a80a59b42
parent2b75e1f11ec6fb9bb0d00a29d8ab05b91b91a8f7 (diff)
- Refresh patches.suse/btrfs-handle-EIO.
- Refresh patches.suse/btrfs-volumes-schedule_bio-should-return-void. suse-commit: d97ade6b368a2df016856cf3a396bba01215e2fd
-rw-r--r--fs/btrfs/file-item.c2
-rw-r--r--fs/btrfs/volumes.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 3ce80ee171a0..a14dbca5974e 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -643,7 +643,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
* item changed size or key
*/
ret = btrfs_split_item(trans, root, path, &key, offset);
- if (ret) {
+ if (ret && ret != -EAGAIN) {
btrfs_abort_transaction(trans, root, ret);
goto out;
}
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f818f4821d79..57305e88ea82 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4031,6 +4031,7 @@ static noinline void schedule_bio(struct btrfs_root *root,
bio_get(bio);
btrfsic_submit_bio(rw, bio);
bio_put(bio);
+ return;
}
/*