diff options
| author | Chris Mason <clm@fb.com> | 2015-10-13 02:24:15 +0300 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-13 02:24:15 +0300 |
| commit | 62fb50ab7c903357c92cef2f7677235b92ac575f (patch) | |
| tree | 28f66d4e2c14b508b6b24795bfadf11aaada2d75 /fs/btrfs/extent-tree.c | |
| parent | 640926ffdda7e817965d3bfb5bbbc51598ccf49b (diff) | |
| parent | 73416dab235e5ff030e3b3c61da0cd6ced324fc9 (diff) | |
| download | linux-62fb50ab7c903357c92cef2f7677235b92ac575f.tar.xz | |
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/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 4480a36b7c5b..92a5b4cad2ab 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -8694,7 +8694,7 @@ out: if (!for_reloc && root_dropped == false) btrfs_add_dead_root(root); if (err && err != -EAGAIN) - btrfs_std_error(root->fs_info, err); + btrfs_std_error(root->fs_info, err, NULL); return err; } |