From patchwork Tue Aug 23 10:25:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 9295429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F3CCF60757 for ; Tue, 23 Aug 2016 10:45:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4EF528BD3 for ; Tue, 23 Aug 2016 10:45:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9F7328BE4; Tue, 23 Aug 2016 10:45:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9824128BD3 for ; Tue, 23 Aug 2016 10:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757446AbcHWKpT (ORCPT ); Tue, 23 Aug 2016 06:45:19 -0400 Received: from mx2.suse.de ([195.135.220.15]:59409 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756725AbcHWKnp (ORCPT ); Tue, 23 Aug 2016 06:43:45 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 064DDAD93 for ; Tue, 23 Aug 2016 10:26:26 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id E3A5ADAA2E; Tue, 23 Aug 2016 12:25:20 +0200 (CEST) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 10/13] btrfs-progs: mkfs: switch BUG_ON to error handling in traverse_directory Date: Tue, 23 Aug 2016 12:25:14 +0200 Message-Id: <1471947917-5324-11-git-send-email-dsterba@suse.com> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1471947917-5324-1-git-send-email-dsterba@suse.com> References: <1471947917-5324-1-git-send-email-dsterba@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: David Sterba --- mkfs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mkfs.c b/mkfs.c index 3f0a3322cc76..c28a8bb7e983 100644 --- a/mkfs.c +++ b/mkfs.c @@ -910,7 +910,12 @@ static int traverse_directory(struct btrfs_trans_handle *trans, parent_inum, dir_index_cnt, &cur_inode); if (ret == -EEXIST) { - BUG_ON(st.st_nlink <= 1); + if (st.st_nlink <= 1) { + error( + "item %s already exists but has wrong st_nlink %ld <= 1", + cur_file->d_name, st.st_nlink); + goto fail; + } continue; } if (ret) {