From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id C8BFB7F4E for ; Tue, 27 May 2014 19:15:20 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id B42E68F8084 for ; Tue, 27 May 2014 17:15:20 -0700 (PDT) Received: from sandeen.net (sandeen.net [63.231.237.45]) by cuda.sgi.com with ESMTP id 5inuqX3joabPBKH9 for ; Tue, 27 May 2014 17:15:19 -0700 (PDT) Message-ID: <53852A98.7000809@sandeen.net> Date: Tue, 27 May 2014 19:15:20 -0500 From: Eric Sandeen MIME-Version: 1.0 Subject: [PATCH 2/2, RFC] mkfs.xfs: don't call blkid_get_topology on regular files References: <53852A05.5040006@redhat.com> In-Reply-To: <53852A05.5040006@redhat.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Eric Sandeen , xfs-oss If we encounter a target that's really a regular file, even without "-d file..." on the cmdline, call platform_findsizes() instead of blkid_get_topology to try to discover the "sector size" via the fsgeom() call. Signed-off-by: Eric Sandeen --- diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 37c05a9..74180c9 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -454,12 +454,26 @@ static void get_topology( struct fs_topology *ft, int force_overwrite) { - if (!xi->disfile) { - const char *dfile = xi->volname ? xi->volname : xi->dname; + int is_a_file = 0; + struct stat statbuf; + char *dfile = xi->volname ? xi->volname : xi->dname; + if (!stat(dfile, &statbuf) && S_ISREG(statbuf.st_mode)) + is_a_file = 1; + + if (!xi->disfile && !is_a_file) { blkid_get_topology(dfile, &ft->dsunit, &ft->dswidth, &ft->lsectorsize, &ft->psectorsize, force_overwrite); + } else { + int fd; + long long dummy; + + fd = open(dfile, O_RDONLY); + if (fd >= 0) { + platform_findsizes(dfile, fd, &dummy, &ft->lsectorsize); + close(fd); + } } if (xi->rtname && !xi->risfile) { _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs