From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id ECFF87F93 for ; Wed, 17 Jun 2015 18:26:39 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id C048D30405F for ; Wed, 17 Jun 2015 16:26:36 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id ahu8wSngB5sKD11O (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Wed, 17 Jun 2015 16:26:35 -0700 (PDT) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 542A33702DA for ; Wed, 17 Jun 2015 23:26:35 +0000 (UTC) Received: from liberator.sandeen.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5HNQYqF027138 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 17 Jun 2015 19:26:35 -0400 Message-ID: <55820229.1010701@redhat.com> Date: Wed, 17 Jun 2015 18:26:33 -0500 From: Eric Sandeen MIME-Version: 1.0 Subject: [PATCH] mkfs.xfs: always use underlying fs sector size when mkfs'ing a file 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: xfs-oss If we are mkfs'ing a file, and that file is on a 4k sector filesystem, we should make the fs image file with the same sector size, or things may fail when they try to do direct IO in 512 byte chunks (depending on whether it is a 512e or "hard" 4k device). Earlier commits attempted this to some degree: 5a7d59 xfsprogs: try to handle mkfs of a file on 4k sector device 3800a2 mkfs.xfs: don't call blkid_get_topology on existing regular files but inexplicably missed the case where mkfs.xfs with "-d file" was specified. One more try; in get_topology(), try to get the underlying fs sector size in *all* cases where we are mkfs'ing a file, and set the sector size accordingly. Signed-off-by: Eric Sandeen --- (This does it for 512e as well as hard 4k drives, but I think that's probably ok? If not, perhaps we should go further and attempt to discern logical and physical sectors for the device under the filesystem. Is it worth it? Not sure it is.) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index e2a052d..e44c390 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -462,31 +462,34 @@ static void get_topology( struct fs_topology *ft, int force_overwrite) { - if (!xi->disfile) { - char *dfile = xi->volname ? xi->volname : xi->dname; - struct stat statbuf; + struct stat statbuf; + char *dfile = xi->volname ? xi->volname : xi->dname; - /* - * If our target is a regular file, and xi->disfile isn't - * set (i.e. no "-d file" invocation), use platform_findsizes - * to try to obtain the underlying filesystem's requirements - * for direct IO; we'll set our sector size to that if possible. - */ - if (!stat(dfile, &statbuf) && S_ISREG(statbuf.st_mode)) { - int fd; - long long dummy; - - fd = open(dfile, O_RDONLY); - if (fd >= 0) { - platform_findsizes(dfile, fd, &dummy, - &ft->lsectorsize); - close(fd); - } - } else { - blkid_get_topology(dfile, &ft->dsunit, &ft->dswidth, - &ft->lsectorsize, &ft->psectorsize, - force_overwrite); + /* + * If our target is a regular file, use platform_findsizes + * to try to obtain the underlying filesystem's requirements + * for direct IO; we'll set our sector size to that if possible. + */ + if (xi->disfile || + (!stat(dfile, &statbuf) && S_ISREG(statbuf.st_mode))) { + int fd; + int flags = O_RDONLY; + long long dummy; + + /* with xi->disfile we may not have the file yet! */ + if (xi->disfile) + flags |= O_CREAT; + + fd = open(dfile, flags, 0666); + if (fd >= 0) { + platform_findsizes(dfile, fd, &dummy, &ft->lsectorsize); + close (fd); } + + } else { + blkid_get_topology(dfile, &ft->dsunit, &ft->dswidth, + &ft->lsectorsize, &ft->psectorsize, + force_overwrite); } if (xi->rtname && !xi->risfile) { _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs