projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
extent-tree.c
diff --git
a/fs/btrfs/extent-tree.c
b/fs/btrfs/extent-tree.c
index 3b6d20bc2388eeafb6a823ca9a559c93d7ac2fab..bbafa05519daa69b0fb05dc5d5583cbfb4c6fa56 100644
(file)
--- a/
fs/btrfs/extent-tree.c
+++ b/
fs/btrfs/extent-tree.c
@@
-7491,7
+7491,7
@@
out:
*/
if (root_dropped == false)
btrfs_add_dead_root(root);
- if (err)
+ if (err
&& err != -EAGAIN
)
btrfs_std_error(root->fs_info, err);
return err;
}