From patchwork Tue Mar 11 10:24:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gui Hecheng X-Patchwork-Id: 3810681 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB44BBF540 for ; Tue, 11 Mar 2014 10:28:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2CBA82021F for ; Tue, 11 Mar 2014 10:28:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 100B5202A1 for ; Tue, 11 Mar 2014 10:28:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754915AbaCKK2S (ORCPT ); Tue, 11 Mar 2014 06:28:18 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:42060 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753499AbaCKK2O (ORCPT ); Tue, 11 Mar 2014 06:28:14 -0400 X-IronPort-AV: E=Sophos;i="4.97,629,1389715200"; d="scan'208";a="9678343" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 11 Mar 2014 18:24:20 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s2BASBXK024746; Tue, 11 Mar 2014 18:28:11 +0800 Received: from localhost.localdomain ([10.167.226.111]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2014031118252859-554624 ; Tue, 11 Mar 2014 18:25:28 +0800 From: Gui Hecheng To: linux-btrfs@vger.kernel.org Cc: sgw@linux.intel.com, Gui Hecheng Subject: [PATCH] btrfs-progs: fix bug on mkfs with relative path specified Date: Tue, 11 Mar 2014 18:24:27 +0800 Message-Id: <1394533467-24967-1-git-send-email-guihc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/11 18:25:28, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/11 18:25:29, Serialize complete at 2014/03/11 18:25:29 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The bug accurs when exec: # mkfs.btrfs -r (note: the path should be 'valid' correspond to your `pwd`) error msg: $ scandir for failed: No such file... Replace strdup() with realpath() to get the correct scan path. Reported-by: Saul Wold Signed-off-by: Gui Hecheng --- mkfs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mkfs.c b/mkfs.c index 2dc90c2..1bd3069 100644 --- a/mkfs.c +++ b/mkfs.c @@ -756,6 +756,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, ino_t parent_inum, cur_inum; ino_t highest_inum = 0; char *parent_dir_name; + char real_path[PATH_MAX]; struct btrfs_path path; struct extent_buffer *leaf; struct btrfs_key root_dir_key; @@ -764,7 +765,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, /* Add list for source directory */ dir_entry = malloc(sizeof(struct directory_name_entry)); dir_entry->dir_name = dir_name; - dir_entry->path = strdup(dir_name); + dir_entry->path = realpath(dir_name, real_path); parent_inum = highest_inum + BTRFS_FIRST_FREE_OBJECTID; dir_entry->inum = parent_inum; @@ -876,7 +877,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans, } free_namelist(files, count); - free(parent_dir_entry->path); free(parent_dir_entry); index_cnt = 2; @@ -887,7 +887,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans, fail: free_namelist(files, count); fail_no_files: - free(parent_dir_entry->path); free(parent_dir_entry); return -1; }