diff options
author | Wang Shilong <wangsl.fnst@cn.fujitsu.com> | 2014-01-07 13:26:58 +0400 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-02 03:58:45 +0400 |
commit | 1ff4cfa53b56c70c657d446f26f669bf7d2ee9ec (patch) | |
tree | 53f652619193f5ac8f0892eb3080a7550eb4664c /fs | |
parent | dca0911e0166162f38926c19ae0fce3b3cf37f01 (diff) | |
download | linux-1ff4cfa53b56c70c657d446f26f669bf7d2ee9ec.tar.xz |
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: Ben Hutchings <ben@decadent.org.uk>
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 49eefdbf58b3..f63719a20d1e 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -6725,7 +6725,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; } |