From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id o08GjoeQ055771 for ; Fri, 8 Jan 2010 10:45:50 -0600 Received: from mail.sandeen.net (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id 28FF3153217 for ; Fri, 8 Jan 2010 08:46:42 -0800 (PST) Received: from mail.sandeen.net (64-131-60-146.usfamily.net [64.131.60.146]) by cuda.sgi.com with ESMTP id 5vsCA9HztnsoM18O for ; Fri, 08 Jan 2010 08:46:42 -0800 (PST) Message-ID: <4B476171.4020701@sandeen.net> Date: Fri, 08 Jan 2010 10:46:41 -0600 From: Eric Sandeen MIME-Version: 1.0 Subject: [PATCH V2] mkfs: handle 4k sector devices more cleanly References: <4B1E9A25.50108@redhat.com> In-Reply-To: <4B1E9A25.50108@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 Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: Eric Sandeen Cc: Christoph Hellwig , xfs-oss Trying to mkfs a 4k sector device today fails w/o manually specifying sector size: # modprobe scsi_debug sector_size=4096 dev_size_mb=32 # mkfs.xfs -f /dev/sdc mkfs.xfs: warning - cannot set blocksize on block device /dev/sdc: Invalid argument Warning: the data subvolume sector size 512 is less than the sector size reported by the device (4096). ... add sectorsize to the device topology info, and use that if present. Also check that explicitly requested sector sizes are not smaller than the hardware size. This already fails today, but with the more cryptic "cannot set blocksize" ioctl error above. Signed-off-by: Eric Sandeen --- diff --git a/libxfs/linux.c b/libxfs/linux.c index bc49903..2e07d54 100644 --- a/libxfs/linux.c +++ b/libxfs/linux.c @@ -112,9 +112,9 @@ platform_set_blocksize(int fd, char *path, dev_t device, int blocksize, int fata if (major(device) != RAMDISK_MAJOR) { if ((error = ioctl(fd, BLKBSZSET, &blocksize)) < 0) { fprintf(stderr, _("%s: %s - cannot set blocksize " - "on block device %s: %s\n"), + "%d on block device %s: %s\n"), progname, fatal ? "error": "warning", - path, strerror(errno)); + blocksize, path, strerror(errno)); } } return error; diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index d3ed00a..356dcb4 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -33,6 +33,7 @@ struct fs_topology { int dsunit; /* stripe unit - data subvolume */ int dswidth; /* stripe width - data subvolume */ int rtswidth; /* stripe width - rt subvolume */ + int sectorsize; int sectoralign; }; @@ -320,7 +321,7 @@ out_free_probe: return ret; } -static void blkid_get_topology(const char *device, int *sunit, int *swidth) +static void blkid_get_topology(const char *device, int *sunit, int *swidth, int *sectorsize) { blkid_topology tp; blkid_probe pr; @@ -348,6 +349,8 @@ static void blkid_get_topology(const char *device, int *sunit, int *swidth) val = blkid_topology_get_optimal_io_size(tp) >> 9; if (val > 1) *swidth = val; + val = blkid_probe_get_sectorsize(pr); + *sectorsize = val; if (blkid_topology_get_alignment_offset(tp) != 0) { fprintf(stderr, @@ -370,13 +373,14 @@ static void get_topology(libxfs_init_t *xi, struct fs_topology *ft) if (!xi->disfile) { const char *dfile = xi->volname ? xi->volname : xi->dname; - blkid_get_topology(dfile, &ft->dsunit, &ft->dswidth); + blkid_get_topology(dfile, &ft->dsunit, &ft->dswidth, + &ft->sectorsize); } if (xi->rtname && !xi->risfile) { int dummy; - blkid_get_topology(xi->rtname, &dummy, &ft->rtswidth); + blkid_get_topology(xi->rtname, &dummy, &ft->rtswidth, &dummy); } } #else /* ENABLE_BLKID */ @@ -403,15 +407,29 @@ check_overwrite( return 0; } +extern void platform_findsizes (char *path, int fd, long long *sz, int *bsz); + static void get_topology(libxfs_init_t *xi, struct fs_topology *ft) { char *dfile = xi->volname ? xi->volname : xi->dname; + int bsz = BBSIZE; if (!xi->disfile) { + int fd; + long long dummy; + get_subvol_stripe_wrapper(dfile, SVTYPE_DATA, &ft->dsunit, &ft->dswidth, &ft->sectoralign); + fd = open(dfile, O_RDONLY); + /* If this fails we just fall back to BBSIZE */ + if (fd) { + platform_findsizes(dfile, fd, &dummy, &bsz); + close(fd); + } } + ft->sectorsize = bsz; + if (xi->rtname && !xi->risfile) { int dummy1; @@ -1543,8 +1561,15 @@ main( memset(&ft, 0, sizeof(ft)); get_topology(&xi, &ft); - if (ft.sectoralign) { - sectorsize = blocksize; + /* + * MD wants sector size set == block size to avoid switching. + * Otherwise, if not specfied via command, use device sectorsize + */ + if (ft.sectoralign || !ssflag) { + if (ft.sectoralign) + sectorsize = blocksize; + else + sectorsize = ft.sectorsize; sectorlog = libxfs_highbit32(sectorsize); if (loginternal) { lsectorsize = sectorsize; @@ -1556,6 +1581,11 @@ main( fprintf(stderr, _("illegal sector size %d\n"), sectorsize); usage(); } + if (sectorsize < ft.sectorsize) { + fprintf(stderr, _("illegal sector size %d; hw sector is %d\n"), + sectorsize, ft.sectorsize); + usage(); + } if (lsectorsize < XFS_MIN_SECTORSIZE || lsectorsize > XFS_MAX_SECTORSIZE || lsectorsize > blocksize) { fprintf(stderr, _("illegal log sector size %d\n"), lsectorsize); @@ -1751,8 +1781,6 @@ main( if (slflag || ssflag) xi.setblksize = sectorsize; - else - xi.setblksize = 1; /* * Initialize. This will open the log and rt devices as well. _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs