diff --git a/[refs] b/[refs]
index 9bd7c775e5c5..eac2713aac35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69ffb54347a71c4f2a4694e0c1155af8538d55f6
+refs/heads/master: 962197babeccc1f4cc8aa28ad844df80bdc85ed0
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 406666cb6156..d41e467b4aa2 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -662,7 +662,7 @@ static noinline int submit_compressed_extents(struct inode *inode,
 					   async_extent->compressed_size,
 					   async_extent->compressed_size,
 					   0, alloc_hint, &ins, 1);
-			if (ret)
+			if (ret && ret != -ENOSPC)
 				btrfs_abort_transaction(trans, root, ret);
 			btrfs_end_transaction(trans, root);
 		}