LU-5501 revert: blkid,ext2fs: avoid name clash with __u{8,16,32,64}

LU-5501 revert: blkid,ext2fs: avoid name clash with __u{8,16,32,64}

This reverts commit 5023510dd7f0ab40a216d3600ab665e2053cc070.

Temporarily revert this change for the Lustre e2fsprogs, since it
causes Lustre 2.5.3 (only) builds to fail in llverfs.c and llverdev.c.
They include <ext2fs/ext2fs.h>, which includes ext2-types.h, which
only conditionally declares __u32 et.al. with the patch applied.

The Lustre 2.5.3 config.h file defines HAVE___U32 et.al and config.h
is implicitly included into llverfs.c and llverdev.c by libtool in
the Makefile, but these __u* types are not actually declared in any
of the headers included by llverfs.c or llverdev.c, hence failure.

This patch can be dropped once http://review.whamcloud.com/11840
is landed and Lustre 2.5.4 is released.  It is not needed for b2_4-
(doesn't use libtool) or b2_6+ (removes HAVE___U* defines).

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: If16ac468d6b861d79bd84e7963729f5b46500c1e
Reviewed-on: http://review.whamcloud.com/11901
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>