From patchwork Fri Oct 31 18:01:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 5206211 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 216819F349 for ; Fri, 31 Oct 2014 18:01:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 511192013D for ; Fri, 31 Oct 2014 18:01:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73B0F2013A for ; Fri, 31 Oct 2014 18:01:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758111AbaJaSBw (ORCPT ); Fri, 31 Oct 2014 14:01:52 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:23757 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750889AbaJaSBv (ORCPT ); Fri, 31 Oct 2014 14:01:51 -0400 Received: from pps.filterd (m0004346 [127.0.0.1]) by mx0a-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id s9VHsJQn006290; Fri, 31 Oct 2014 11:01:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=F7OD11PdUpIlC657fdR65Aevl3jBBpzd92kfiS7291E=; b=ln2wj2w4Cwo9FRGe+6+cRVQUWWqrgn70X8xtEmmWXLxWVdCw/APNTnBKrwuwAqsR4lQz U1YFsyNjJ3hmeveIhrQ60Dk9LQLWbZkly/kRYOTwY9mTOl6DskLpF30PIB5Sprx+S0U0 D1KIgrEx8eG92KmKcrX+7w3RVCnk8m/p57A= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 1qbwcc22pa-19 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=OK); Fri, 31 Oct 2014 11:01:48 -0700 Received: from localhost (192.168.57.29) by mail.thefacebook.com (192.168.16.23) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 31 Oct 2014 11:01:44 -0700 From: Josef Bacik To: , Subject: [PATCH 05/11] Btrfs-progs: spit out the broken file when ignoring errors Date: Fri, 31 Oct 2014 14:01:23 -0400 Message-ID: <1414778489-4049-6-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1414778489-4049-1-git-send-email-jbacik@fb.com> References: <1414778489-4049-1-git-send-email-jbacik@fb.com> MIME-Version: 1.0 X-Originating-IP: [192.168.57.29] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.12.52, 1.0.28, 0.0.0000 definitions=2014-10-31_08:2014-10-31, 2014-10-31, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 spamscore=0 suspectscore=2 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1410310168 X-FB-Internal: deliver Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's nice to ignore errors on restore, but spit out the filename so the user knows which files of his aren't going to look right. Thanks, Signed-off-by: Josef Bacik --- cmds-restore.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmds-restore.c b/cmds-restore.c index 38a131e..b52d5c8 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -840,6 +840,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, ret = copy_file(root, fd, &location, path_name); close(fd); if (ret) { + fprintf(stderr, "Error copying data for %s\n", + path_name); if (ignore_errors) goto next; btrfs_free_path(path); @@ -917,6 +919,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, output_rootdir, dir, mreg); free(dir); if (ret) { + fprintf(stderr, "Error searching %s\n", + path_name); if (ignore_errors) goto next; btrfs_free_path(path);