Browse Source

Btrfs: drop spin lock when memory alloc fails

Drop spin lock in convert_extent_bit() when memory alloc fails,
otherwise, it will be a deadlock.

Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Liu Bo 13 years ago
parent
commit
1cf4ffdb32
1 changed files with 16 additions and 8 deletions
  1. 16 8
      fs/btrfs/extent_io.c

+ 16 - 8
fs/btrfs/extent_io.c

@@ -935,8 +935,10 @@ again:
 	node = tree_search(tree, start);
 	node = tree_search(tree, start);
 	if (!node) {
 	if (!node) {
 		prealloc = alloc_extent_state_atomic(prealloc);
 		prealloc = alloc_extent_state_atomic(prealloc);
-		if (!prealloc)
-			return -ENOMEM;
+		if (!prealloc) {
+			err = -ENOMEM;
+			goto out;
+		}
 		err = insert_state(tree, prealloc, start, end, &bits);
 		err = insert_state(tree, prealloc, start, end, &bits);
 		prealloc = NULL;
 		prealloc = NULL;
 		BUG_ON(err == -EEXIST);
 		BUG_ON(err == -EEXIST);
@@ -992,8 +994,10 @@ hit_next:
 	 */
 	 */
 	if (state->start < start) {
 	if (state->start < start) {
 		prealloc = alloc_extent_state_atomic(prealloc);
 		prealloc = alloc_extent_state_atomic(prealloc);
-		if (!prealloc)
-			return -ENOMEM;
+		if (!prealloc) {
+			err = -ENOMEM;
+			goto out;
+		}
 		err = split_state(tree, state, prealloc, start);
 		err = split_state(tree, state, prealloc, start);
 		BUG_ON(err == -EEXIST);
 		BUG_ON(err == -EEXIST);
 		prealloc = NULL;
 		prealloc = NULL;
@@ -1024,8 +1028,10 @@ hit_next:
 			this_end = last_start - 1;
 			this_end = last_start - 1;
 
 
 		prealloc = alloc_extent_state_atomic(prealloc);
 		prealloc = alloc_extent_state_atomic(prealloc);
-		if (!prealloc)
-			return -ENOMEM;
+		if (!prealloc) {
+			err = -ENOMEM;
+			goto out;
+		}
 
 
 		/*
 		/*
 		 * Avoid to free 'prealloc' if it can be merged with
 		 * Avoid to free 'prealloc' if it can be merged with
@@ -1051,8 +1057,10 @@ hit_next:
 	 */
 	 */
 	if (state->start <= end && state->end > end) {
 	if (state->start <= end && state->end > end) {
 		prealloc = alloc_extent_state_atomic(prealloc);
 		prealloc = alloc_extent_state_atomic(prealloc);
-		if (!prealloc)
-			return -ENOMEM;
+		if (!prealloc) {
+			err = -ENOMEM;
+			goto out;
+		}
 
 
 		err = split_state(tree, state, prealloc, end + 1);
 		err = split_state(tree, state, prealloc, end + 1);
 		BUG_ON(err == -EEXIST);
 		BUG_ON(err == -EEXIST);