diff options
| author | Chris Mason | 2015-10-13 01:24:15 +0200 |
|---|---|---|
| committer | Chris Mason | 2015-10-13 01:24:15 +0200 |
| commit | 62fb50ab7c903357c92cef2f7677235b92ac575f (patch) | |
| tree | 28f66d4e2c14b508b6b24795bfadf11aaada2d75 /fs/btrfs/root-tree.c | |
| parent | Merge branch 'cleanup/messages' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Btrfs: move kobj stuff out of dev_replace lock range (diff) | |
| download | kernel-qcow2-linux-62fb50ab7c903357c92cef2f7677235b92ac575f.tar.gz kernel-qcow2-linux-62fb50ab7c903357c92cef2f7677235b92ac575f.tar.xz kernel-qcow2-linux-62fb50ab7c903357c92cef2f7677235b92ac575f.zip | |
Merge branch 'anand/sysfs-updates-v4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/root-tree.c')
| -rw-r--r-- | fs/btrfs/root-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index 42267d37bb94..bc9dcc53f66d 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -284,7 +284,7 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root) trans = btrfs_join_transaction(tree_root); if (IS_ERR(trans)) { err = PTR_ERR(trans); - btrfs_error(tree_root->fs_info, err, + btrfs_std_error(tree_root->fs_info, err, "Failed to start trans to delete " "orphan item"); break; @@ -293,7 +293,7 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root) root_key.objectid); btrfs_end_transaction(trans, tree_root); if (err) { - btrfs_error(tree_root->fs_info, err, + btrfs_std_error(tree_root->fs_info, err, "Failed to delete root orphan " "item"); break; |