]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Btrfs: handle EAGAIN case properly in btrfs_drop_snapshot()
authorWang Shilong <wangsl.fnst@cn.fujitsu.com>
Tue, 7 Jan 2014 09:26:58 +0000 (17:26 +0800)
committerChris Mason <clm@fb.com>
Tue, 28 Jan 2014 21:20:23 +0000 (13:20 -0800)
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>
fs/btrfs/extent-tree.c

index 41fe80b9db47eca3cca58d2ff2e145d19c30b753..77acc08738959b4c50e0e01cced58cd8e7d308df 100644 (file)
@@ -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;
 }