Manage: improve error message when given a non-block device.
As dev_open uses O_DIRECT it will fail on directories and such. So we never get to report that it isn't a block device. So do a 'stat' earlier and if it is a block device, report the error there. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
4cda8682c6
commit
839f27a380
29
Manage.c
29
Manage.c
|
@ -1205,10 +1205,22 @@ int Manage_subdevs(char *devname, int fd,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if (stat(dv->devname, &stb) != 0) {
|
||||||
|
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')
|
||||||
|
/* non-fatal. Also improbable */
|
||||||
|
continue;
|
||||||
|
pr_err("%s is not a block device.\n",
|
||||||
|
dv->devname);
|
||||||
|
goto abort;
|
||||||
|
}
|
||||||
tfd = dev_open(dv->devname, O_RDONLY);
|
tfd = dev_open(dv->devname, O_RDONLY);
|
||||||
if (tfd < 0 && dv->disposition == 'r' &&
|
if (tfd < 0 && dv->disposition == 'r')
|
||||||
lstat(dv->devname, &stb) == 0)
|
/* Be happy, the stat worked, that is
|
||||||
/* Be happy, the lstat worked, that is
|
|
||||||
* enough for --remove
|
* enough for --remove
|
||||||
*/
|
*/
|
||||||
;
|
;
|
||||||
|
@ -1219,22 +1231,13 @@ int Manage_subdevs(char *devname, int fd,
|
||||||
if (dv->disposition == 'M')
|
if (dv->disposition == 'M')
|
||||||
/* non-fatal */
|
/* non-fatal */
|
||||||
continue;
|
continue;
|
||||||
pr_err("cannot find %s: %s\n",
|
pr_err("Cannot open %s: %s\n",
|
||||||
dv->devname, strerror(errno));
|
dv->devname, strerror(errno));
|
||||||
goto abort;
|
goto abort;
|
||||||
}
|
}
|
||||||
close(tfd);
|
close(tfd);
|
||||||
tfd = -1;
|
tfd = -1;
|
||||||
}
|
}
|
||||||
if ((stb.st_mode & S_IFMT) != S_IFBLK) {
|
|
||||||
if (dv->disposition == 'M')
|
|
||||||
/* non-fatal. Also improbable */
|
|
||||||
continue;
|
|
||||||
pr_err("%s is not a "
|
|
||||||
"block device.\n",
|
|
||||||
dv->devname);
|
|
||||||
goto abort;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
switch(dv->disposition){
|
switch(dv->disposition){
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue