[dio.c,V2,6/6] Btrfs: fix goto fail mistakes in btrfs_dio_read.
diff mbox

Message ID 4B8EB09C.6050501@gmail.com
State Under Review, archived
Headers show

Commit Message

jim owens March 3, 2010, 6:55 p.m. UTC
None

Patch
diff mbox

diff --git a/fs/btrfs/dio.c b/fs/btrfs/dio.c
index 05a7445..b1beafc 100644
--- a/fs/btrfs/dio.c
+++ b/fs/btrfs/dio.c
@@ -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