[PATCH] xfsprogs: blkid is now mandatory

[Jan Tulak]

----- Original Message -----
> From: "Dave Chinner" <david at fromorbit.com>
> To: "Jan Tulak" <jtulak at redhat.com>
> Cc: hch at infradead.org, sandeen at redhat.com, xfs at oss.sgi.com
> Sent: Thursday, July 2, 2015 12:55:36 AM
> Subject: Re: [PATCH] xfsprogs: blkid is now mandatory
> 
> On Wed, Jul 01, 2015 at 06:01:01PM +0200, Jan Tulak wrote:
> > Because blkid is here for a long time, I hereby propose a patch for
> > removing support
> > for NOT having blkid. The current support through set of #ifdef is prone to
> > errors like
> > making a patch just in one of the branches, and according to a recent talk
> > between
> > Christoph and Eric, it is not necessary to keep it supported.
> > 
> > Remove code for checking ENABLE_BLKID, and the code when ENABLE_BLKID is
> > not defined.
> > It makes blkid required for compilation.
> > 
> > Signed-off-by: Jan Tulak <jtulak at redhat.com>
> > ---
> >  Makefile             |  5 ----
> >  configure.ac         |  6 +----
> >  doc/INSTALL          | 44 ------------------------------------
> >  include/builddefs.in |  1 -
> >  libdisk/Makefile     |  4 ----
> >  m4/package_blkid.m4  |  7 +++---
> >  mkfs/Makefile        | 21 ++++-------------
> >  mkfs/xfs_mkfs.c      | 64
> >  ----------------------------------------------------
> >  8 files changed, 10 insertions(+), 142 deletions(-)
> 
> Given that only mkfs.xfs uses libdisk, which is now not linked to
> any binary, shouldn't libdisk/ be removed completely?
> 
> Cheers,
> 
> Dave.

True, I prepared a fixed patch with libdisk removed. Also, it looks to me like ft.sectoralign in xfs_mkfs.c is not used anymore:

	if (ft.sectoralign) {
		/*
		 * Older Linux software RAID versions want the sector size
		 * to match the block size to avoid switching I/O sizes.
		 * For the legacy libdisk case we thus set the sector size to
		 * match the block size.  For systems using libblkid we assume
		 * that the kernel is recent enough to not require this and
		 * ft.sectoralign will never be set.
		 */
		sectorsize = blocksize;
	} 

So I removed it too.
Jan

-- 
Jan Tulak
jtulak at redhat.com