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

[jim owens]

Signed-off-by: jim owens <jim6...@gmail.com>
---
 fs/btrfs/dio.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

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
-- 
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html