From patchwork Sat Mar 20 11:37:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 87103 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2KBcWod009161 for ; Sat, 20 Mar 2010 11:38:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752016Ab0CTLhn (ORCPT ); Sat, 20 Mar 2010 07:37:43 -0400 Received: from mail-bw0-f209.google.com ([209.85.218.209]:46328 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751750Ab0CTLhl (ORCPT ); Sat, 20 Mar 2010 07:37:41 -0400 Received: by bwz1 with SMTP id 1so664591bwz.21 for ; Sat, 20 Mar 2010 04:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mail-followup-to:mime-version:content-type :content-disposition:user-agent; bh=BZofDzvqHWJqVuGHUVmDPGW7RjMEaxXOdkLCq6ji8Mc=; b=IGOovIBBKez778MLuVLoiAoj4X+F4tagoD71+qWRxPCqivA8eEXTilyRqndJIj1T2J 9HcJf6iM4X57ALrZckImv8wmXAldaIO/0Etk956m9YRg5yAm4BYU8B9hZssdqnWXd8Xd qIssjcmu8H0tfgpofaXzRT23qEq4RI6SGz71k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mail-followup-to:mime-version :content-type:content-disposition:user-agent; b=WjfwDS04J7JCC+Bs2Abe8HGbAHcOHpFMAMTTVsIIDbr0V8288VXkas9jZ4ECHkCGXc swmLmNvlhtlOUQk1iV1qeCIpk5T9jOO4cSMk6KczaCAmWJzUBt6B80XVqikpczkXB5qJ fb4/+3L5lcSa77qBKBrTuGMgb4z10we7CG+iQ= Received: by 10.204.6.203 with SMTP id a11mr5753590bka.33.1269085059689; Sat, 20 Mar 2010 04:37:39 -0700 (PDT) Received: from bicker ([196.43.68.49]) by mx.google.com with ESMTPS id g18sm9063140bkw.13.2010.03.20.04.37.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 20 Mar 2010 04:37:38 -0700 (PDT) Date: Sat, 20 Mar 2010 14:37:31 +0300 From: Dan Carpenter To: Chris Mason Cc: Dan Carpenter , Christoph Hellwig , Venkatesh Pallipadi , =?iso-8859-1?Q?Andr=E9?= Goddard Rosa , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch 2/3] btrfs cleanup: remove more dead code Message-ID: <20100320113730.GZ5331@bicker> Mail-Followup-To: Dan Carpenter , Chris Mason , Christoph Hellwig , Venkatesh Pallipadi , =?iso-8859-1?Q?Andr=E9?= Goddard Rosa , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 20 Mar 2010 11:38:32 +0000 (UTC) diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index 94668b1..010f299 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -380,16 +380,7 @@ struct extent_map *search_extent_mapping(struct extent_map_tree *tree, em = NULL; goto out; } - if (IS_ERR(rb_node)) { - em = ERR_PTR(PTR_ERR(rb_node)); - goto out; - } em = rb_entry(rb_node, struct extent_map, rb_node); - goto found; - - em = NULL; - goto out; - found: atomic_inc(&em->refs); out: