From: Mark Fasheh <mfasheh@suse.de>
To: linux-btrfs@vger.kernel.org
Cc: Chris Mason <chris.mason@oracle.com>,
Mark Fasheh <mfasheh@suse.de>, Mark Fasheh <mfasheh@suse.com>
Subject: [PATCH 10/20] btrfs: go readonly on insert error in btrfs_add_root_ref()
Date: Thu, 15 Sep 2011 10:34:49 -0700 [thread overview]
Message-ID: <1316108099-5099-11-git-send-email-mfasheh@suse.de> (raw)
In-Reply-To: <1316108099-5099-1-git-send-email-mfasheh@suse.de>
From: Mark Fasheh <mfasheh@suse.com>
In btrfs_add_root_ref() we BUG if an error is encountered during
REF/BACKREF insertion. This does not look like a logic error, thus the BUG
is not called for. However, I don't think there's a simple way to recover
from such an error at that point, so we mark the fs readonly instead.
At the same time, we can update the following caller of
btrfs_add_root_ref() which BUG_ON from an error:
- create_subvol: now passes the return code back to userspace
- create_pending_snapshot: goes readonly on any error from
btrfs_add_root_ref().
Signed-off-by: Mark Fasheh <mfasheh@suse.de>
---
fs/btrfs/ioctl.c | 4 ++--
fs/btrfs/root-tree.c | 8 ++++++--
fs/btrfs/transaction.c | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 7cf0133..8adb220 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -430,8 +430,8 @@ static noinline int create_subvol(struct btrfs_root *root,
ret = btrfs_add_root_ref(trans, root->fs_info->tree_root,
objectid, root->root_key.objectid,
btrfs_ino(dir), index, name, namelen);
-
- BUG_ON(ret);
+ if (ret)
+ goto fail;
d_instantiate(dentry, btrfs_lookup_dentry(dir, dentry));
fail:
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index f409990..02f2bf3 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -407,7 +407,10 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans,
again:
ret = btrfs_insert_empty_item(trans, tree_root, path, &key,
sizeof(*ref) + name_len);
- BUG_ON(ret);
+ if (ret) {
+ btrfs_std_error(tree_root->fs_info, ret);
+ goto out_free;
+ }
leaf = path->nodes[0];
ref = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_root_ref);
@@ -426,8 +429,9 @@ again:
goto again;
}
+out_free:
btrfs_free_path(path);
- return 0;
+ return ret;
}
/*
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 7dc36fa..7c46ece 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -991,7 +991,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
parent_root->root_key.objectid,
btrfs_ino(parent_inode), index,
dentry->d_name.name, dentry->d_name.len);
- BUG_ON(ret);
+ btrfs_std_error(fs_info, ret);
dput(parent);
key.offset = (u64)-1;
--
1.7.6
next prev parent reply other threads:[~2011-09-15 17:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 17:34 [PATCH 0/20] btrfs: More error handling fixes Mark Fasheh
2011-09-15 17:34 ` [PATCH 01/20] btrfs: Don't BUG_ON errors from btrfs_create_subvol_root() Mark Fasheh
2011-09-15 17:34 ` [PATCH 02/20] btrfs: Don't BUG_ON() errors in update_ref_for_cow() Mark Fasheh
2011-09-15 17:34 ` [PATCH 03/20] btrfs: Don't BUG_ON kzalloc error in btrfs_lookup_csums_range() Mark Fasheh
2011-09-15 17:34 ` [PATCH 04/20] btrfs: make insert_ptr() void Mark Fasheh
2011-09-15 17:34 ` [PATCH 05/20] btrfs: Don't BUG_ON errors in __finish_chunk_alloc() Mark Fasheh
2011-09-15 17:34 ` [PATCH 06/20] btrfs: fix error check of btrfs_lookup_dentry() Mark Fasheh
2011-09-15 17:34 ` [PATCH 07/20] btrfs: make fixup_low_keys() void Mark Fasheh
2011-09-15 17:34 ` [PATCH 08/20] btrfs: make del_ptr() and btrfs_del_leaf() void Mark Fasheh
2011-09-15 17:34 ` [PATCH 09/20] btrfs: Don't BUG_ON failures in find_and_setup_root() Mark Fasheh
2011-09-15 17:34 ` Mark Fasheh [this message]
2011-09-15 17:34 ` [PATCH 11/20] btrfs: Go readonly on bad extent refs in update_ref_for_cow() Mark Fasheh
2011-09-15 17:34 ` [PATCH 12/20] btrfs: Don't BUG_ON errors from update_ref_for_cow() Mark Fasheh
2011-09-15 17:34 ` [PATCH 13/20] btrfs: Go readonly on tree errors in balance_level Mark Fasheh
2011-09-15 17:34 ` [PATCH 14/20] btrfs: Document BUG() in find_lock_delalloc_range() Mark Fasheh
2011-09-15 17:34 ` [PATCH 15/20] btrfs: Go readonly on missing ref in btrfs_get_parent() Mark Fasheh
2011-09-15 17:34 ` [PATCH 16/20] btrfs: make add_delayed_ref_head() void Mark Fasheh
2011-09-15 17:34 ` [PATCH 17/20] btrfs: make add_delayed_tree_ref() void Mark Fasheh
2011-09-15 17:34 ` [PATCH 18/20] btrfs: Don't BUG_ON insert errors in btrfs_alloc_dev_extent() Mark Fasheh
2011-09-15 17:34 ` [PATCH 19/20] btrfs: Remove BUG_ON from __btrfs_alloc_chunk() Mark Fasheh
2011-09-15 17:34 ` [PATCH 20/20] btrfs: Remove BUG_ON from __finish_chunk_alloc() Mark Fasheh
2011-09-15 18:03 ` [PATCH 0/20] btrfs: More error handling fixes David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316108099-5099-11-git-send-email-mfasheh@suse.de \
--to=mfasheh@suse.de \
--cc=chris.mason@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=mfasheh@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).