From patchwork Mon Feb 1 03:08:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 76022 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 o1139sQv024844 for ; Mon, 1 Feb 2010 03:09:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753193Ab0BADJw (ORCPT ); Sun, 31 Jan 2010 22:09:52 -0500 Received: from rcsinet12.oracle.com ([148.87.113.124]:54289 "EHLO rcsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752719Ab0BADJv (ORCPT ); Sun, 31 Jan 2010 22:09:51 -0500 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by rcsinet12.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o1139nVD004911 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 1 Feb 2010 03:09:51 GMT Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o112J1GK026515 for ; Mon, 1 Feb 2010 03:09:49 GMT Received: from abhmt016.oracle.com by acsmt354.oracle.com with ESMTP id 2629771264993730; Sun, 31 Jan 2010 19:08:50 -0800 Received: from [10.182.121.20] (/10.182.121.20) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 31 Jan 2010 19:08:49 -0800 Message-ID: <4B6645BE.4060903@oracle.com> Date: Mon, 01 Feb 2010 11:08:46 +0800 From: "Yan, Zheng" User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.7) Gecko/20100120 Fedora/3.0.1-1.fc12 Thunderbird/3.0.1 MIME-Version: 1.0 To: linux-btrfs@vger.kernel.org, chris Mason Subject: [PATCH] btrfsck: Remove superfluous WARN_ON X-Source-IP: acsmt354.oracle.com [141.146.40.154] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090209.4B6645FD.00F4:SCFMA4539814,ss=1,fgs=0 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]); Mon, 01 Feb 2010 03:09:54 +0000 (UTC) diff -urp btrfs-progs-unstable/btrfsck.c btrfs-progs-2/btrfsck.c --- btrfs-progs-unstable/btrfsck.c 2009-09-28 15:54:55.980479398 +0800 +++ btrfs-progs-2/btrfsck.c 2010-01-31 09:46:24.645485459 +0800 @@ -581,7 +581,6 @@ again: } ret = insert_existing_cache_extent(dst, &ins->cache); if (ret == -EEXIST) { - WARN_ON(src == &src_node->root_cache); conflict = get_inode_rec(dst, rec->ino, 1); merge_inode_recs(rec, conflict, dst); if (rec->checked) {