summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorWang Shilong <wangsl.fnst@cn.fujitsu.com>2014-01-07 17:26:58 +0800
committerChris Mason <clm@fb.com>2014-01-28 13:20:23 -0800
commit90515e7f5d7d24cbb2a4038a3f1b5cfa2921aa17 (patch)
tree0946397fffb9438e488e0d1ba25eea34fefbee0c /fs
parent8e56338d7d0ee38ecae86d35dae43020356acca1 (diff)
downloadop-kernel-dev-90515e7f5d7d24cbb2a4038a3f1b5cfa2921aa17.zip
op-kernel-dev-90515e7f5d7d24cbb2a4038a3f1b5cfa2921aa17.tar.gz
Btrfs: handle EAGAIN case properly in btrfs_drop_snapshot()
We may return early in btrfs_drop_snapshot(), we shouldn't call btrfs_std_err() for this case, fix it. Cc: stable@vger.kernel.org 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>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/extent-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 41fe80b..77acc08 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -7835,7 +7835,7 @@ out:
*/
if (!for_reloc && root_dropped == false)
btrfs_add_dead_root(root);
- if (err)
+ if (err && err != -EAGAIN)
btrfs_std_error(root->fs_info, err);
return err;
}
OpenPOWER on IntegriCloud