mdadm/util: unify stat checking blkdev into function
declare function stat_is_blkdev() to integrate repeated stat checking blkdev operations, it returns 'true/1' when it is a block device, and returns 'false/0' when it isn't. The devname is necessary parameter, *rdev is optional, parse the pointer of dev_t *rdev, if valid, assigned device number to dev_t *rdev, if NULL, ignores. Signed-off-by: Zhilong Liu <zlliu@suse.com> Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
parent
0a6bff09d4
commit
9e04ac1c43
|
@ -512,15 +512,12 @@ static int select_devices(struct mddev_dev *devlist,
|
||||||
|
|
||||||
/* Now reject spares that don't match domains of identified members */
|
/* Now reject spares that don't match domains of identified members */
|
||||||
for (tmpdev = devlist; tmpdev; tmpdev = tmpdev->next) {
|
for (tmpdev = devlist; tmpdev; tmpdev = tmpdev->next) {
|
||||||
struct stat stb;
|
|
||||||
if (tmpdev->used != 3)
|
if (tmpdev->used != 3)
|
||||||
continue;
|
continue;
|
||||||
if (stat(tmpdev->devname, &stb)< 0) {
|
if (!stat_is_blkdev(tmpdev->devname, &rdev)) {
|
||||||
pr_err("fstat failed for %s: %s\n",
|
|
||||||
tmpdev->devname, strerror(errno));
|
|
||||||
tmpdev->used = 2;
|
tmpdev->used = 2;
|
||||||
} else {
|
} else {
|
||||||
struct dev_policy *pol = devid_policy(stb.st_rdev);
|
struct dev_policy *pol = devid_policy(rdev);
|
||||||
int dt = domain_test(domains, pol, NULL);
|
int dt = domain_test(domains, pol, NULL);
|
||||||
if (inargv && dt != 0)
|
if (inargv && dt != 0)
|
||||||
/* take this spare as domains match
|
/* take this spare as domains match
|
||||||
|
|
25
Build.c
25
Build.c
|
@ -41,7 +41,6 @@ int Build(char *mddev, struct mddev_dev *devlist,
|
||||||
* cc = chunk size factor: 0==4k, 1==8k etc.
|
* cc = chunk size factor: 0==4k, 1==8k etc.
|
||||||
*/
|
*/
|
||||||
int i;
|
int i;
|
||||||
struct stat stb;
|
|
||||||
dev_t rdev;
|
dev_t rdev;
|
||||||
int subdevs = 0, missing_disks = 0;
|
int subdevs = 0, missing_disks = 0;
|
||||||
struct mddev_dev *dv;
|
struct mddev_dev *dv;
|
||||||
|
@ -65,16 +64,8 @@ int Build(char *mddev, struct mddev_dev *devlist,
|
||||||
missing_disks++;
|
missing_disks++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (stat(dv->devname, &stb)) {
|
if (!stat_is_blkdev(dv->devname, NULL))
|
||||||
pr_err("Cannot find %s: %s\n",
|
|
||||||
dv->devname, strerror(errno));
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
|
||||||
if ((stb.st_mode & S_IFMT) != S_IFBLK) {
|
|
||||||
pr_err("%s is not a block device.\n",
|
|
||||||
dv->devname);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s->raiddisks != subdevs) {
|
if (s->raiddisks != subdevs) {
|
||||||
|
@ -162,16 +153,8 @@ int Build(char *mddev, struct mddev_dev *devlist,
|
||||||
|
|
||||||
if (strcmp("missing", dv->devname) == 0)
|
if (strcmp("missing", dv->devname) == 0)
|
||||||
continue;
|
continue;
|
||||||
if (stat(dv->devname, &stb)) {
|
if (!stat_is_blkdev(dv->devname, &rdev))
|
||||||
pr_err("Weird: %s has disappeared.\n",
|
|
||||||
dv->devname);
|
|
||||||
goto abort;
|
goto abort;
|
||||||
}
|
|
||||||
if ((stb.st_mode & S_IFMT)!= S_IFBLK) {
|
|
||||||
pr_err("Weird: %s is no longer a block device.\n",
|
|
||||||
dv->devname);
|
|
||||||
goto abort;
|
|
||||||
}
|
|
||||||
fd = open(dv->devname, O_RDONLY|O_EXCL);
|
fd = open(dv->devname, O_RDONLY|O_EXCL);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
pr_err("Cannot open %s: %s\n",
|
pr_err("Cannot open %s: %s\n",
|
||||||
|
@ -187,8 +170,8 @@ int Build(char *mddev, struct mddev_dev *devlist,
|
||||||
disk.state = (1<<MD_DISK_SYNC) | (1<<MD_DISK_ACTIVE);
|
disk.state = (1<<MD_DISK_SYNC) | (1<<MD_DISK_ACTIVE);
|
||||||
if (dv->writemostly == FlagSet)
|
if (dv->writemostly == FlagSet)
|
||||||
disk.state |= 1<<MD_DISK_WRITEMOSTLY;
|
disk.state |= 1<<MD_DISK_WRITEMOSTLY;
|
||||||
disk.major = major(stb.st_rdev);
|
disk.major = major(rdev);
|
||||||
disk.minor = minor(stb.st_rdev);
|
disk.minor = minor(rdev);
|
||||||
if (ioctl(mdfd, ADD_NEW_DISK, &disk)) {
|
if (ioctl(mdfd, ADD_NEW_DISK, &disk)) {
|
||||||
pr_err("ADD_NEW_DISK failed for %s: %s\n",
|
pr_err("ADD_NEW_DISK failed for %s: %s\n",
|
||||||
dv->devname, strerror(errno));
|
dv->devname, strerror(errno));
|
||||||
|
|
|
@ -86,8 +86,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
|
||||||
* - if number of OK devices match expected, or -R and there are enough,
|
* - if number of OK devices match expected, or -R and there are enough,
|
||||||
* start the array (auto-readonly).
|
* start the array (auto-readonly).
|
||||||
*/
|
*/
|
||||||
struct stat stb;
|
dev_t rdev, rdev2;
|
||||||
dev_t rdev;
|
|
||||||
struct mdinfo info, dinfo;
|
struct mdinfo info, dinfo;
|
||||||
struct mdinfo *sra = NULL, *d;
|
struct mdinfo *sra = NULL, *d;
|
||||||
struct mddev_ident *match;
|
struct mddev_ident *match;
|
||||||
|
@ -108,18 +107,8 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
|
||||||
|
|
||||||
struct createinfo *ci = conf_get_create_info();
|
struct createinfo *ci = conf_get_create_info();
|
||||||
|
|
||||||
if (stat(devname, &stb) < 0) {
|
if (!stat_is_blkdev(devname, &rdev))
|
||||||
if (c->verbose >= 0)
|
|
||||||
pr_err("stat failed for %s: %s.\n",
|
|
||||||
devname, strerror(errno));
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
|
||||||
if ((stb.st_mode & S_IFMT) != S_IFBLK) {
|
|
||||||
if (c->verbose >= 0)
|
|
||||||
pr_err("%s is not a block device.\n",
|
|
||||||
devname);
|
|
||||||
return rv;
|
|
||||||
}
|
|
||||||
dfd = dev_open(devname, O_RDONLY);
|
dfd = dev_open(devname, O_RDONLY);
|
||||||
if (dfd < 0) {
|
if (dfd < 0) {
|
||||||
if (c->verbose >= 0)
|
if (c->verbose >= 0)
|
||||||
|
@ -158,10 +147,8 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
|
||||||
if (!devlist) {
|
if (!devlist) {
|
||||||
devlist = conf_get_devs();
|
devlist = conf_get_devs();
|
||||||
for (;devlist; devlist = devlist->next) {
|
for (;devlist; devlist = devlist->next) {
|
||||||
struct stat st2;
|
if (stat_is_blkdev(devlist->devname, &rdev2) &&
|
||||||
if (stat(devlist->devname, &st2) == 0 &&
|
rdev2 == rdev)
|
||||||
(st2.st_mode & S_IFMT) == S_IFBLK &&
|
|
||||||
st2.st_rdev == stb.st_rdev)
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
11
Manage.c
11
Manage.c
|
@ -1510,24 +1510,16 @@ int Manage_subdevs(char *devname, int fd,
|
||||||
*/
|
*/
|
||||||
rdev = makedev(mj, mn);
|
rdev = makedev(mj, mn);
|
||||||
} else {
|
} else {
|
||||||
struct stat stb;
|
|
||||||
tfd = dev_open(dv->devname, O_RDONLY);
|
tfd = dev_open(dv->devname, O_RDONLY);
|
||||||
if (tfd >= 0) {
|
if (tfd >= 0) {
|
||||||
fstat_is_blkdev(tfd, dv->devname, &rdev);
|
fstat_is_blkdev(tfd, dv->devname, &rdev);
|
||||||
close(tfd);
|
close(tfd);
|
||||||
} else {
|
} else {
|
||||||
int open_err = errno;
|
int open_err = errno;
|
||||||
if (stat(dv->devname, &stb) != 0) {
|
if (!stat_is_blkdev(dv->devname, &rdev)) {
|
||||||
pr_err("Cannot find %s: %s\n",
|
|
||||||
dv->devname, strerror(errno));
|
|
||||||
goto abort;
|
|
||||||
}
|
|
||||||
if ((stb.st_mode & S_IFMT) != S_IFBLK) {
|
|
||||||
if (dv->disposition == 'M')
|
if (dv->disposition == 'M')
|
||||||
/* non-fatal. Also improbable */
|
/* non-fatal. Also improbable */
|
||||||
continue;
|
continue;
|
||||||
pr_err("%s is not a block device.\n",
|
|
||||||
dv->devname);
|
|
||||||
goto abort;
|
goto abort;
|
||||||
}
|
}
|
||||||
if (dv->disposition == 'r')
|
if (dv->disposition == 'r')
|
||||||
|
@ -1544,7 +1536,6 @@ int Manage_subdevs(char *devname, int fd,
|
||||||
goto abort;
|
goto abort;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rdev = stb.st_rdev;
|
|
||||||
}
|
}
|
||||||
switch(dv->disposition){
|
switch(dv->disposition){
|
||||||
default:
|
default:
|
||||||
|
|
16
Monitor.c
16
Monitor.c
|
@ -993,23 +993,13 @@ static void link_containers_with_subarrays(struct state *list)
|
||||||
/* Not really Monitor but ... */
|
/* Not really Monitor but ... */
|
||||||
int Wait(char *dev)
|
int Wait(char *dev)
|
||||||
{
|
{
|
||||||
struct stat stb;
|
|
||||||
char devnm[32];
|
char devnm[32];
|
||||||
char *tmp;
|
|
||||||
int rv = 1;
|
int rv = 1;
|
||||||
int frozen_remaining = 3;
|
int frozen_remaining = 3;
|
||||||
|
|
||||||
if (stat(dev, &stb) != 0) {
|
if (!stat_is_blkdev(dev, NULL))
|
||||||
pr_err("Cannot find %s: %s\n", dev,
|
|
||||||
strerror(errno));
|
|
||||||
return 2;
|
return 2;
|
||||||
}
|
strcpy(devnm, dev);
|
||||||
tmp = stat2devnm(&stb);
|
|
||||||
if (!tmp) {
|
|
||||||
pr_err("%s is not a block device.\n", dev);
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
strcpy(devnm, tmp);
|
|
||||||
|
|
||||||
while(1) {
|
while(1) {
|
||||||
struct mdstat_ent *ms = mdstat_read(1, 0);
|
struct mdstat_ent *ms = mdstat_read(1, 0);
|
||||||
|
@ -1068,6 +1058,8 @@ int WaitClean(char *dev, int sock, int verbose)
|
||||||
int rv = 1;
|
int rv = 1;
|
||||||
char devnm[32];
|
char devnm[32];
|
||||||
|
|
||||||
|
if (!stat_is_blkdev(dev, NULL))
|
||||||
|
return 2;
|
||||||
fd = open(dev, O_RDONLY);
|
fd = open(dev, O_RDONLY);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
if (verbose)
|
if (verbose)
|
||||||
|
|
1
mdadm.h
1
mdadm.h
|
@ -1435,6 +1435,7 @@ extern int check_partitions(int fd, char *dname,
|
||||||
unsigned long long freesize,
|
unsigned long long freesize,
|
||||||
unsigned long long size);
|
unsigned long long size);
|
||||||
extern int fstat_is_blkdev(int fd, char *devname, dev_t *rdev);
|
extern int fstat_is_blkdev(int fd, char *devname, dev_t *rdev);
|
||||||
|
extern int stat_is_blkdev(char *devname, dev_t *rdev);
|
||||||
|
|
||||||
extern int get_mdp_major(void);
|
extern int get_mdp_major(void);
|
||||||
extern int get_maj_min(char *dev, int *major, int *minor);
|
extern int get_maj_min(char *dev, int *major, int *minor);
|
||||||
|
|
10
super-ddf.c
10
super-ddf.c
|
@ -3490,7 +3490,7 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
|
||||||
char *dev, unsigned long long *freesize,
|
char *dev, unsigned long long *freesize,
|
||||||
int verbose)
|
int verbose)
|
||||||
{
|
{
|
||||||
struct stat stb;
|
dev_t rdev;
|
||||||
struct ddf_super *ddf = st->sb;
|
struct ddf_super *ddf = st->sb;
|
||||||
struct dl *dl;
|
struct dl *dl;
|
||||||
unsigned long long maxsize;
|
unsigned long long maxsize;
|
||||||
|
@ -3526,13 +3526,11 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
/* This device must be a member of the set */
|
/* This device must be a member of the set */
|
||||||
if (stat(dev, &stb) < 0)
|
if (!stat_is_blkdev(dev, NULL))
|
||||||
return 0;
|
|
||||||
if ((S_IFMT & stb.st_mode) != S_IFBLK)
|
|
||||||
return 0;
|
return 0;
|
||||||
for (dl = ddf->dlist ; dl ; dl = dl->next) {
|
for (dl = ddf->dlist ; dl ; dl = dl->next) {
|
||||||
if (dl->major == (int)major(stb.st_rdev) &&
|
if (dl->major == (int)major(rdev) &&
|
||||||
dl->minor == (int)minor(stb.st_rdev))
|
dl->minor == (int)minor(rdev))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!dl) {
|
if (!dl) {
|
||||||
|
|
|
@ -6855,7 +6855,7 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
|
||||||
unsigned long long *freesize,
|
unsigned long long *freesize,
|
||||||
int verbose)
|
int verbose)
|
||||||
{
|
{
|
||||||
struct stat stb;
|
dev_t rdev;
|
||||||
struct intel_super *super = st->sb;
|
struct intel_super *super = st->sb;
|
||||||
struct imsm_super *mpb;
|
struct imsm_super *mpb;
|
||||||
struct dl *dl;
|
struct dl *dl;
|
||||||
|
@ -6920,13 +6920,11 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This device must be a member of the set */
|
/* This device must be a member of the set */
|
||||||
if (stat(dev, &stb) < 0)
|
if (!stat_is_blkdev(dev, &rdev))
|
||||||
return 0;
|
|
||||||
if ((S_IFMT & stb.st_mode) != S_IFBLK)
|
|
||||||
return 0;
|
return 0;
|
||||||
for (dl = super->disks ; dl ; dl = dl->next) {
|
for (dl = super->disks ; dl ; dl = dl->next) {
|
||||||
if (dl->major == (int)major(stb.st_rdev) &&
|
if (dl->major == (int)major(rdev) &&
|
||||||
dl->minor == (int)minor(stb.st_rdev))
|
dl->minor == (int)minor(rdev))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!dl) {
|
if (!dl) {
|
||||||
|
|
17
util.c
17
util.c
|
@ -747,6 +747,23 @@ int fstat_is_blkdev(int fd, char *devname, dev_t *rdev)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int stat_is_blkdev(char *devname, dev_t *rdev)
|
||||||
|
{
|
||||||
|
struct stat stb;
|
||||||
|
|
||||||
|
if (stat(devname, &stb) != 0) {
|
||||||
|
pr_err("stat failed for %s: %s\n", devname, strerror(errno));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if ((S_IFMT & stb.st_mode) != S_IFBLK) {
|
||||||
|
pr_err("%s is not a block device.\n", devname);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if (rdev)
|
||||||
|
*rdev = stb.st_rdev;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
int ask(char *mesg)
|
int ask(char *mesg)
|
||||||
{
|
{
|
||||||
char *add = "";
|
char *add = "";
|
||||||
|
|
Loading…
Reference in New Issue