diff --git a/[refs] b/[refs] index ed5a12bc0d3c..a55c41fa724f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f699d38b6556c393ac80f1c23c2053502a51631 +refs/heads/master: 7654b72417e10e294563496e25211200f9b8b6d3 diff --git a/trunk/fs/btrfs/relocation.c b/trunk/fs/btrfs/relocation.c index 5a105a086acf..646ee21bb035 100644 --- a/trunk/fs/btrfs/relocation.c +++ b/trunk/fs/btrfs/relocation.c @@ -3813,7 +3813,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) ret = btrfs_block_rsv_check(rc->extent_root, rc->block_rsv, 5); if (ret < 0) { - if (ret != -EAGAIN) { + if (ret != -ENOSPC) { err = ret; WARN_ON(1); break;