Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IMSM/DDF: don't recognised these metadata on partitions. 

These metadata are not expected on partitions, and they have
no way of differentiation whether which is correct if they
are found both on the device and on the last partition.

So if the device is a partition, refuse to read the metadata.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2010-04-29 16:09:59 +10:00
parent 4eb269706f
commit 691c6ee1b6
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mdadm.h
View File

@ -876,6 +876,7 @@ extern int enough(int level, int raid_disks, int layout, int clean,
extern int ask(char *mesg);
extern unsigned long long get_component_size(int fd);
extern void remove_partitions(int fd);
extern int test_partition(int fd);
extern unsigned long long calc_array_size(int level, int raid_disks, int layout,
int chunksize, unsigned long long devsize);
extern int flush_metadata_updates(struct supertype *st);

4
super-ddf.c
View File

@ -783,6 +783,10 @@ static int load_super_ddf(struct supertype *st, int fd,
if (get_dev_size(fd, devname, &dsize) == 0)
return 1;
if (test_partition(fd))
/* DDF is not allowed on partitions */
return 1;
/* 32M is a lower bound */
if (dsize <= 32*1024*1024) {
if (devname)

4
super-intel.c
View File

@ -2798,6 +2798,10 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
return 0;
#endif
if (test_partition(fd))
/* IMSM not allowed on partitions */
return 1;
free_super_imsm(st);
super = alloc_super();

25
util.c
View File

@ -302,6 +302,31 @@ void remove_partitions(int fd)
#endif
}
int test_partition(int fd)
{
/* Check if fd is a whole-disk or a partition.
* BLKPG will return EINVAL on a partition, and BLKPG_DEL_PARTITION
* will return ENXIO on an invalid partition number.
*/
struct blkpg_ioctl_arg a;
struct blkpg_partition p;
a.op = BLKPG_DEL_PARTITION;
a.data = (void*)&p;
a.datalen = sizeof(p);
a.flags = 0;
memset(a.data, 0, a.datalen);
p.pno = 1<<30;
if (ioctl(fd, BLKPG, &a) == 0)
/* Very unlikely, but not a partition */
return 0;
if (errno == ENXIO)
/* not a partition */
return 0;
return 1;
}
int enough(int level, int raid_disks, int layout, int clean,
char *avail, int avail_disks)
{