From patchwork Thu Feb 16 21:52:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13144070 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39FD5C636CC for ; Thu, 16 Feb 2023 21:54:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229642AbjBPVyX (ORCPT ); Thu, 16 Feb 2023 16:54:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229852AbjBPVyW (ORCPT ); Thu, 16 Feb 2023 16:54:22 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC677199C1 for ; Thu, 16 Feb 2023 13:54:02 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0DBABB829C1 for ; Thu, 16 Feb 2023 21:52:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF02EC433EF; Thu, 16 Feb 2023 21:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676584373; bh=a37Dj5RdtMGYRK2mNzeB8TS5yGaDkFpNxQ4UhsVZ1ME=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=C1FSfbYLGS7lyjisbaOwE5PjUct4ji+Y1K2R+AGWPB8eoZhJ1mqQCX2ldDI+3yNtP vsbl+sWGap83Nez+lHd2zadASopnZ6SgzOfxxK4nj44otMXDSEiAYl2x8FOlUhvxe5 HX+2vKk4KH+mijIPzNFctvXfQOIZV4zEKtLLCcE+xF4H76m/DTJN908ekq7I/JoUhj rUh/6zsMSejydjKlfoWPqrs61+0ER0SngFeNccea9kiBCwJ6xim78L8i0BGu+BN/CP 72ZFWeP7cbZIq3XYuQg8adRsu60ANqe8p71EIBZH5SnNFbeVdqeSV31SXGAEBo2KZq zrxt4RwCwSSVw== Subject: [PATCH 1/5] xfs_spaceman: fix broken -g behavior in freesp command From: "Darrick J. Wong" To: cem@kernel.org, djwong@kernel.org Cc: linux-xfs@vger.kernel.org, daan.j.demeyer@gmail.com Date: Thu, 16 Feb 2023 13:52:53 -0800 Message-ID: <167658437328.3590000.18137446679798085024.stgit@magnolia> In-Reply-To: <167658436759.3590000.3700844510708970684.stgit@magnolia> References: <167658436759.3590000.3700844510708970684.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Don't zero out the histogram bucket count when turning on group summary mode -- this will screw up the data structures and it's pointless. Signed-off-by: Darrick J. Wong Reviewed-by: Carlos Maiolino --- spaceman/freesp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/spaceman/freesp.c b/spaceman/freesp.c index 423568a4248..70dcdb5c923 100644 --- a/spaceman/freesp.c +++ b/spaceman/freesp.c @@ -284,7 +284,6 @@ init( speced = 1; break; case 'g': - histcount = 0; gflag++; break; case 'h': From patchwork Thu Feb 16 21:52:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13144075 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03829C636CC for ; Thu, 16 Feb 2023 21:58:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229741AbjBPV6H (ORCPT ); Thu, 16 Feb 2023 16:58:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229541AbjBPV6G (ORCPT ); Thu, 16 Feb 2023 16:58:06 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 976CD34F4A for ; Thu, 16 Feb 2023 13:58:05 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BF022B829C2 for ; Thu, 16 Feb 2023 21:53:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5DE0CC433EF; Thu, 16 Feb 2023 21:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676584379; bh=3we7A9vDCGbgxQAjt4sDrPfuFt/V8kiXm2FMM0iuXN4=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=Za6t4jP1EDGjFQCR86JQ5KXWHrheh46thUlOm+wYsoFV89SGs0Jgx3cOKs2pqwZjx tPyg4Vr2dvC5hiUF8PpFJzPutqt9tPD7kkrrB9bNa/S54k45mityQkihR4jRXHeUmg gJ7uk4ZHsHxyWb70L4UT+Iqd45yIlRXKreN3OpfMBt0+dv/9R+rFtxaIl8VMNhC8mp vLONysBTH3FZQRzzCvEOHzuqumQrLR5LJ730XZOAL7yTNQneSj1bOdE/o9KXtGw9vU ++ndz+y7N0ljoV5h5DdBOYHuPp0mRZf1oa8vajV0p31ocOLJL1XG4KMWD4+oTbuYS6 zzACArEwQ2D2Q== Subject: [PATCH 2/5] xfs_scrub: fix broken realtime free blocks unit conversions From: "Darrick J. Wong" To: cem@kernel.org, djwong@kernel.org Cc: linux-xfs@vger.kernel.org, daan.j.demeyer@gmail.com Date: Thu, 16 Feb 2023 13:52:58 -0800 Message-ID: <167658437893.3590000.1698651202541264559.stgit@magnolia> In-Reply-To: <167658436759.3590000.3700844510708970684.stgit@magnolia> References: <167658436759.3590000.3700844510708970684.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong r_blocks is in units of fs blocks, but freertx is in units of realtime extents. Add the missing conversion factor so we don't end up with bogus things like this: Pretend that sda and sdb are both 100T volumes. # mkfs.xfs -f /dev/sda -b -r rtdev=/dev/sdb,extsize=2m # mount /dev/sda /mnt -o rtdev=/dev/sdb # xfs_scrub -dTvn /mnt Phase 7: Check summary counters. 3.5TiB data used; 99.8TiB realtime data used; 55 inodes used. 2.0GiB data found; 50.0MiB realtime data found; 55 inodes found. 55 inodes counted; 0 inodes checked. We just created the filesystem, the realtime volume should be empty. Signed-off-by: Darrick J. Wong Reviewed-by: Carlos Maiolino --- scrub/fscounters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scrub/fscounters.c b/scrub/fscounters.c index f21b24e0935..3ceae3715dc 100644 --- a/scrub/fscounters.c +++ b/scrub/fscounters.c @@ -138,7 +138,7 @@ scrub_scan_estimate_blocks( *d_blocks = ctx->mnt.fsgeom.datablocks; *d_bfree = fc.freedata; *r_blocks = ctx->mnt.fsgeom.rtblocks; - *r_bfree = fc.freertx; + *r_bfree = fc.freertx * ctx->mnt.fsgeom.rtextsize; *f_files_used = fc.allocino - fc.freeino; return 0; From patchwork Thu Feb 16 21:53:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13144072 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F833C636CC for ; Thu, 16 Feb 2023 21:55:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230220AbjBPVzI (ORCPT ); Thu, 16 Feb 2023 16:55:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230238AbjBPVzG (ORCPT ); Thu, 16 Feb 2023 16:55:06 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F2505381C for ; Thu, 16 Feb 2023 13:54:25 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6129FB829C4 for ; Thu, 16 Feb 2023 21:53:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C1B8C433D2; Thu, 16 Feb 2023 21:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676584385; bh=FVY71ycVl1HQg0aXR0FcDrJQ/i2iz6auVfd1LvnZmo8=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=S+P+y+Qz7UQbtLMRAiyCE7VuV1WMUbFDPVhV6f5REpkEwaR4bqAJa2w2QGd73hlqA hX+oWouqBa939tQeFuo0ae1SIeBPNiSWzFmpU/l5R76pdBdrxetqVgqxFHgJsiHD1T wHHAwKMdT4l7mI9ZIOnMyGSqBFVzg/arSpJ5dpZzfDStsIKsXbfB6QHHXMaQsXJJPV hE+DDSHc+QZw+P5Q8kfXIUWepxrA7jJ3tg96Ghs4YYCG9InKEEkgb3BmIXdJK7dYDc L/qeLK8FtJbxIvSHBu5UpzynxQxuoI7lKxxyHcor6+Vm9sZZfxMywazLFa0sTX5g8g X7/qasC7+YdQg== Subject: [PATCH 3/5] xfs_io: set fs_path when opening files on foreign filesystems From: "Darrick J. Wong" To: cem@kernel.org, djwong@kernel.org Cc: tytso@mit.edu, linux-xfs@vger.kernel.org, daan.j.demeyer@gmail.com Date: Thu, 16 Feb 2023 13:53:04 -0800 Message-ID: <167658438451.3590000.8820235517511814402.stgit@magnolia> In-Reply-To: <167658436759.3590000.3700844510708970684.stgit@magnolia> References: <167658436759.3590000.3700844510708970684.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Ted noticed that the following command: $ xfs_io -c 'fsmap -d 0 0' /mnt xfs_io: xfsctl(XFS_IOC_GETFSMAP) iflags=0x0 ["/mnt"]: Invalid argument doesn't work on an ext4 filesystem. The above command is supposed to issue a GETFSMAP query against the "data" device. Although the manpage doesn't claim support for ext4, it turns out that this you get this trace data: xfs_io-4144 [002] 210.965642: ext4_getfsmap_low_key: dev 7:0 keydev 163:2567 block 0 len 0 owner 0 flags 0x0 xfs_io-4144 [002] 210.965645: ext4_getfsmap_high_key: dev 7:0 keydev 32:5277:0 block 0 len 0 owner -1 flags 0xffffffff Notice the random garbage in the keydev field -- this happens because openfile (in xfs_io) doesn't initialize *fs_path if the caller doesn't supply a geometry structure or the opened file isn't on an XFS filesystem. IOWs, we feed random heap garbage to the kernel, and the kernel rejects the call unnecessarily. Fix this to set the fspath information even for foreign filesystems. Reported-by: tytso@mit.edu Signed-off-by: Darrick J. Wong Reviewed-by: Carlos Maiolino --- io/open.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/io/open.c b/io/open.c index d8072664c16..15850b5557b 100644 --- a/io/open.c +++ b/io/open.c @@ -116,7 +116,7 @@ openfile( } if (!geom || !platform_test_xfs_fd(fd)) - return fd; + goto set_fspath; if (flags & IO_PATH) { /* Can't call ioctl() on O_PATH fds */ @@ -150,6 +150,7 @@ openfile( } } +set_fspath: if (fs_path) { fsp = fs_table_lookup(path, FS_MOUNT_POINT); if (!fsp) From patchwork Thu Feb 16 21:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13144073 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D893C636CC for ; Thu, 16 Feb 2023 21:55:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229947AbjBPVzc (ORCPT ); Thu, 16 Feb 2023 16:55:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229541AbjBPVzb (ORCPT ); Thu, 16 Feb 2023 16:55:31 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8715C1B56F for ; Thu, 16 Feb 2023 13:55:06 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 12F11B829C5 for ; Thu, 16 Feb 2023 21:53:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B184EC433EF; Thu, 16 Feb 2023 21:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676584390; bh=bFU+IBKoOyXU/gXF6xo2HK3PjRQAbaztWiJc5eRm4vo=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=ohaMR/jE7oChuAlsg53ZFRallfnwoh/Kpi+1rqNkMFzKTtV/bbi5v2OVI/nEvs7X+ 1ZDBpOxPH9Msb0Bj4vVCF7nAbWO0/pPI/pNm8U4DWu8+UzXjP4fLwWtLQe8B8r/L8m DP8wtrzWvqBcNvY7s0bMpN4PTrckuSFQHj0q98UCu/ij15/VPB06pkyH48Mei+mpRV JEPEErk9qlihxGniovqklc7BQfGnThIgwcbNrPJyc+PvNXh3Snxi+d/S9hjgvSeoH2 F6sNDMgmYpxTNn5Qud0I3sQnINJoZC/fmbeeUYotXY8/UTiR55gEuDfa1CB2h4clr1 4QU4BLrV/7cRQ== Subject: [PATCH 4/5] xfs_io: fix bmap command not detecting realtime files with xattrs From: "Darrick J. Wong" To: cem@kernel.org, djwong@kernel.org Cc: Christoph Hellwig , linux-xfs@vger.kernel.org, daan.j.demeyer@gmail.com Date: Thu, 16 Feb 2023 13:53:10 -0800 Message-ID: <167658439020.3590000.194008272775624083.stgit@magnolia> In-Reply-To: <167658436759.3590000.3700844510708970684.stgit@magnolia> References: <167658436759.3590000.3700844510708970684.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Fix the bmap command so that it will detect a realtime file if any of the other file flags (e.g. xattrs) are set. Observed via xfs/556. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Reviewed-by: Carlos Maiolino --- io/bmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/bmap.c b/io/bmap.c index 27383ca6037..722a389baaa 100644 --- a/io/bmap.c +++ b/io/bmap.c @@ -118,7 +118,7 @@ bmap_f( return 0; } - if (fsx.fsx_xflags == FS_XFLAG_REALTIME) { + if (fsx.fsx_xflags & FS_XFLAG_REALTIME) { /* * ag info not applicable to rt, continue * without ag output. From patchwork Thu Feb 16 21:53:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13144074 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 696FAC61DA4 for ; Thu, 16 Feb 2023 21:55:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230232AbjBPVzg (ORCPT ); Thu, 16 Feb 2023 16:55:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbjBPVzf (ORCPT ); Thu, 16 Feb 2023 16:55:35 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09C667690 for ; Thu, 16 Feb 2023 13:55:14 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BA392B829C3 for ; Thu, 16 Feb 2023 21:53:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 660C1C4339B; Thu, 16 Feb 2023 21:53:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676584396; bh=9W5wvr++jX/4xX41z1NoPfZVAcC545x/5KcOP97K1f0=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=WX6dVnnotX1F5LGbCiuaH05vC+JP66aALD0MYhHQB3pYGAKLg+uxEiESF/ZFjSgDg O+sIqoB0LZtql6G4kOxVxgraBPIL1VBZ/nWKFaIsx7ILWiaqVq5R661f5Pd3pTxWnd JBHgptIbz1Nz4Prsqx0Vk2h0yNJluOiQYFYKP61iDlGfTRMqyOwGGfc5UA4LGoMIun zDcwQYh4HHJvMXl8q4ZigajM0R6UN2iAS20SjvTJm8NqGpEfL0hJs6SrPa4UTizTFi wys8cpeOFkZqbf2tvVlCZ2ITuxG98fbpu5qxnDdOJXiHeueZN1ugyi5s8Xfe42uxfC 1URXFjLyt5AOA== Subject: [PATCH 5/5] mkfs: substitute slashes with spaces in protofiles From: "Darrick J. Wong" To: cem@kernel.org, djwong@kernel.org Cc: linux-xfs@vger.kernel.org, daan.j.demeyer@gmail.com Date: Thu, 16 Feb 2023 13:53:15 -0800 Message-ID: <167658439591.3590000.1501103007888420501.stgit@magnolia> In-Reply-To: <167658436759.3590000.3700844510708970684.stgit@magnolia> References: <167658436759.3590000.3700844510708970684.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong A user requested the ability to specify directory entry names in a protofile that have spaces in them. The protofile format itself does not allow spaces (yay 1973-era protofiles!) but it does allow slashes. Slashes aren't allowed in directory entry names, so we'll permit this one gross hack. / 0 0 d--775 1000 1000 : Descending path /code/t/fstests get/isk.sh ---775 1000 1000 /code/t/fstests/getdisk.sh $ Will produce "get isk.h" in the root directory. Requested-by: Daan De Meyer Signed-off-by: Darrick J. Wong --- mkfs/proto.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/mkfs/proto.c b/mkfs/proto.c index 68ecdbf3632..bf8de0189db 100644 --- a/mkfs/proto.c +++ b/mkfs/proto.c @@ -171,6 +171,27 @@ getstr( return NULL; } +/* Extract directory entry name from a protofile. */ +static char * +getdirentname( + char **pp) +{ + char *p = getstr(pp); + char *c = p; + + if (!p) + return NULL; + + /* Replace slash with space because slashes aren't allowed. */ + while (*c) { + if (*c == '/') + *c = ' '; + c++; + } + + return p; +} + static void rsvfile( xfs_mount_t *mp, @@ -580,7 +601,7 @@ parseproto( rtinit(mp); tp = NULL; for (;;) { - name = getstr(pp); + name = getdirentname(pp); if (!name) break; if (strcmp(name, "$") == 0)