diff options
author | Wang Shilong <wangsl.fnst@cn.fujitsu.com> | 2014-01-07 04:26:58 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 14:08:18 -0500 |
commit | 5c61a3d3ff81ddb53006bbc84aca8363b4f2841b (patch) | |
tree | c06b81a1aab42dbd0c07f4045aa37fc1716bf554 /fs | |
parent | 85c3c54bf969f0fd9ba59ee3f6e9849b53428412 (diff) |
Btrfs: handle EAGAIN case properly in btrfs_drop_snapshot()
commit 90515e7f5d7d24cbb2a4038a3f1b5cfa2921aa17 upstream.
We may return early in btrfs_drop_snapshot(), we shouldn't
call btrfs_std_err() for this case, fix it.
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-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 3b6d20bc2388..bbafa05519da 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -7491,7 +7491,7 @@ out: | |||
7491 | */ | 7491 | */ |
7492 | if (root_dropped == false) | 7492 | if (root_dropped == false) |
7493 | btrfs_add_dead_root(root); | 7493 | btrfs_add_dead_root(root); |
7494 | if (err) | 7494 | if (err && err != -EAGAIN) |
7495 | btrfs_std_error(root->fs_info, err); | 7495 | btrfs_std_error(root->fs_info, err); |
7496 | return err; | 7496 | return err; |
7497 | } | 7497 | } |