From: Wang Shilong Date: Tue, 7 Jan 2014 09:26:58 +0000 (+0800) Subject: Btrfs: handle EAGAIN case properly in btrfs_drop_snapshot() X-Git-Tag: v3.10.29~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c61a3d3ff81ddb53006bbc84aca8363b4f2841b;p=platform%2Fkernel%2Flinux-stable.git 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 Signed-off-by: Josef Bacik Signed-off-by: Chris Mason Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 3b6d20b..bbafa05 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -7491,7 +7491,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; }