Skip to contentSkip to conversation

Btrfs: fix goto fail mistakes in btrfs_dio_read.

PATCH New jim owens 1 participant 1 message Mar 3, 2010 Btrfs file system

lore
Share & tools
lore

jim owens

author
#0 lore raw

PATCH v2 6/6 Btrfs: fix goto fail mistakes in btrfs_dio_read.

---
 fs/btrfs/dio.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
fs/btrfs/dio.c +2 -5
index 05a7445..b1beafc 100644
@@ -459,7 +459,7 @@ getlock:
 		end = data_len;
 	if (end <= diocb->start) {
 		mutex_unlock(&diocb->inode->i_mutex);
-		goto fail; /* 0 is returned past EOF */
+		return; /* 0 is returned past EOF */
 	}
 	if (!loop) {
 		loop++;
@@ -489,10 +489,7 @@ getlock:
 				"extent start %llu len %llu\n",
 				diocb->inode->i_ino, diocb->start, len);
 			err = -EIO;
-			goto fail;
-		}
-
-		if (em->block_start == EXTENT_MAP_INLINE) {
+		} else if (em->block_start == EXTENT_MAP_INLINE) {
 			/* ugly stuff because inline can exist in a large file
 			 * with other extents if a hole immediately follows.
 			 * the inline might end short of the btrfs block with
Signature · 1 line
1.6.3.3