public inbox for linux-btrfs@vger.kernel.org
 help / color / mirror / Atom feed
From: jim owens <owens6336@gmail.com>
To: linux-btrfs <linux-btrfs@vger.kernel.org>
Subject: [PATCH dio.c V2 6/6] Btrfs: fix goto fail mistakes in btrfs_dio_read.
Date: Wed, 03 Mar 2010 13:55:24 -0500	[thread overview]
Message-ID: <4B8EB09C.6050501@gmail.com> (raw)


Signed-off-by: jim owens <jim6336@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

                 reply	other threads:[~2010-03-03 18:55 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B8EB09C.6050501@gmail.com \
    --to=owens6336@gmail.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox