ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libblkid: Add metadata signature check for IMSM on 4Kn drives 

Drives with 512 and 4K sectors have different offset for
metadata signature. Without signature detected on 4Kn drives
those drives will not be recognized as raid member. This
patch adds checking for IMSM signature for 4Kn drives.

Signed-off-by: Alexey Obitotskiy <aleksey.obitotskiy@intel.com>
This commit is contained in:
Alexey Obitotskiy 2016-06-24 11:59:35 +02:00 committed by Karel Zak
parent 3383b2f5ca
commit 6c448f452e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libblkid/src/superblocks/isw_raid.c
View File

@ -25,11 +25,11 @@ struct isw_metadata {
#define ISW_SIGNATURE "Intel Raid ISM Cfg Sig. "
static int probe_iswraid(blkid_probe pr,
const struct blkid_idmag *mag __attribute__((__unused__)))
{
uint64_t off;
unsigned int sector_size;
struct isw_metadata *isw;
if (pr->size < 0x10000)
@ -37,16 +37,17 @@ static int probe_iswraid(blkid_probe pr,
if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
return 1;
off = ((pr->size / 0x200) - 2) * 0x200;
isw = (struct isw_metadata *)
blkid_probe_get_buffer(pr,
off,
sizeof(struct isw_metadata));
sector_size = blkid_probe_get_sectorsize(pr);
off = ((pr->size / sector_size) - 2) * sector_size;
isw = (struct isw_metadata *)blkid_probe_get_buffer(pr,
off, sizeof(struct isw_metadata));
if (!isw)
return errno ? -errno : 1;
if (memcmp(isw->sig, ISW_SIGNATURE, sizeof(ISW_SIGNATURE)-1) != 0)
return 1;
if (blkid_probe_sprintf_version(pr, "%6s",
&isw->sig[sizeof(ISW_SIGNATURE)-1]) != 0)
return 1;