From: Li Zefan <lizf@cn.fujitsu.com>
To: Chris Mason <chris.mason@oracle.com>
Cc: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Subject: [PATCH 10/16] Btrfs: clean up search_extent_mapping()
Date: Thu, 14 Jul 2011 11:18:03 +0800 [thread overview]
Message-ID: <4E1E5FEB.7000804@cn.fujitsu.com> (raw)
In-Reply-To: <4E1E5F59.5030208@cn.fujitsu.com>
rb_node returned by __tree_search() can be a valid pointer or NULL,
but won't be some errno.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
fs/btrfs/extent_map.c | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 2d04103..911a9db 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -379,23 +379,12 @@ struct extent_map *search_extent_mapping(struct extent_map_tree *tree,
em = rb_entry(next, struct extent_map, rb_node);
goto found;
}
- if (!rb_node) {
- em = NULL;
- goto out;
- }
- if (IS_ERR(rb_node)) {
- em = ERR_CAST(rb_node);
- goto out;
- }
- em = rb_entry(rb_node, struct extent_map, rb_node);
- goto found;
-
- em = NULL;
- goto out;
+ if (!rb_node)
+ return NULL;
+ em = rb_entry(rb_node, struct extent_map, rb_node);
found:
atomic_inc(&em->refs);
-out:
return em;
}
--
1.7.3.1
next prev parent reply other threads:[~2011-07-14 3:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-14 3:15 [PATCH 00/16] Btrfs: fixes and cleanups for 3.1 Li Zefan
2011-07-14 3:16 ` [PATCH 01/16] Btrfs: copy string correctly in INO_LOOKUP ioctl Li Zefan
2011-07-14 3:16 ` [PATCH 02/16] Btrfs: fix space leak when skipping small extents during trimming Li Zefan
2011-07-14 3:16 ` [PATCH 03/16] Btrfs: fix space leak when trimming free extents Li Zefan
2011-07-14 3:16 ` [PATCH 04/16] Btrfs: check the nodatasum flag when writing compressed files Li Zefan
2011-07-14 3:17 ` [PATCH 05/16] Btrfs: use wait_event() Li Zefan
2011-07-14 3:17 ` [PATCH 06/16] Btrfs: remove a BUG_ON() in btrfs_commit_transaction() Li Zefan
2011-07-14 3:17 ` [PATCH 07/16] Btrfs: remove remaining ref-cache code Li Zefan
2011-07-14 3:17 ` [PATCH 08/16] Btrfs: make acl functions really no-op if acl is not enabled Li Zefan
2011-07-14 3:17 ` [PATCH 09/16] Btrfs: remove redundant code for dir item lookup Li Zefan
2011-07-14 3:18 ` Li Zefan [this message]
2011-07-14 3:18 ` [PATCH 11/16] Btrfs: clean up code for extent_map lookup Li Zefan
2011-07-22 13:20 ` David Sterba
2011-07-14 3:18 ` [PATCH 12/16] Btrfs: clean up code for merging extent maps Li Zefan
2011-07-14 3:18 ` [PATCH 13/16] Btrfs: remove unused members from struct extent_state Li Zefan
2011-07-14 3:19 ` [PATCH 14/16] Btrfs: clean up for insert_state() Li Zefan
2011-07-14 3:19 ` [PATCH 15/16] Btrfs: clean up for wait_extent_bit() Li Zefan
2011-07-14 3:19 ` [PATCH 16/16] Btrfs: clean up for find_first_extent_bit() Li Zefan
2011-07-14 3:21 ` [PATCH 00/16] Btrfs: fixes and cleanups for 3.1 Li Zefan
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=4E1E5FEB.7000804@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=chris.mason@oracle.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.