diff options
author | Wang Shilong <wangsl.fnst@cn.fujitsu.com> | 2014-01-07 17:26:58 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 11:05:48 -0800 |
commit | 06c23d087a238d3838de9b87c793195daae8a8bc (patch) | |
tree | 8b9b6d20649575d7bad76509a70b0568e20f165c | |
parent | 9e7fe101104b9254d37e316250d9570e0b29ecd2 (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>
-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 c4f0a9936f8..224ce21cc0a 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -7033,7 +7033,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; } |