* [PATCH] mdadm/Monitor:dev should be a block file when use --waitclean
@ 2017-03-20 5:21 Zhilong Liu
2017-03-27 22:29 ` jes.sorensen
0 siblings, 1 reply; 2+ messages in thread
From: Zhilong Liu @ 2017-03-20 5:21 UTC (permalink / raw)
To: jes.sorensen; +Cc: linux-raid, Zhilong Liu
Monitor: mdadm --wait-clean /dev/mdX, the dev should
be a block file, otherwise fd2devnm returns NULL and
then triggers core dumped.
Signed-off-by: Zhilong Liu <zlliu@suse.com>
---
Monitor.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Monitor.c b/Monitor.c
index f8850d3..5a2b5ca 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -1065,7 +1065,17 @@ int WaitClean(char *dev, int sock, int verbose)
struct mdinfo *mdi;
int rv = 1;
char devnm[32];
+ struct stat stb;
+ if (stat(dev, &stb) != 0) {
+ pr_err("Cannot find %s: %s\n", dev,
+ strerror(errno));
+ return 2;
+ }
+ if ((S_IFMT & stb.st_mode) != S_IFBLK) {
+ pr_err("%s is not a block device.\n", dev);
+ return 2;
+ }
fd = open(dev, O_RDONLY);
if (fd < 0) {
if (verbose)
--
2.6.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mdadm/Monitor:dev should be a block file when use --waitclean
2017-03-20 5:21 [PATCH] mdadm/Monitor:dev should be a block file when use --waitclean Zhilong Liu
@ 2017-03-27 22:29 ` jes.sorensen
0 siblings, 0 replies; 2+ messages in thread
From: jes.sorensen @ 2017-03-27 22:29 UTC (permalink / raw)
To: Zhilong Liu; +Cc: linux-raid
Zhilong Liu <zlliu@suse.com> writes:
> Monitor: mdadm --wait-clean /dev/mdX, the dev should
> be a block file, otherwise fd2devnm returns NULL and
> then triggers core dumped.
>
> Signed-off-by: Zhilong Liu <zlliu@suse.com>
> ---
> Monitor.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/Monitor.c b/Monitor.c
> index f8850d3..5a2b5ca 100644
> --- a/Monitor.c
> +++ b/Monitor.c
> @@ -1065,7 +1065,17 @@ int WaitClean(char *dev, int sock, int verbose)
> struct mdinfo *mdi;
> int rv = 1;
> char devnm[32];
> + struct stat stb;
>
> + if (stat(dev, &stb) != 0) {
> + pr_err("Cannot find %s: %s\n", dev,
> + strerror(errno));
Please use the 80 characters in the line.
> + return 2;
> + }
> + if ((S_IFMT & stb.st_mode) != S_IFBLK) {
> + pr_err("%s is not a block device.\n", dev);
> + return 2;
> + }
> fd = open(dev, O_RDONLY);
> if (fd < 0) {
> if (verbose)
We have 7-8 instances of this throughout the code (stat and fstat).
Maybe we should make it a utility function instead of duplicating it
further.
Cheers,
Jes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-27 22:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-20 5:21 [PATCH] mdadm/Monitor:dev should be a block file when use --waitclean Zhilong Liu
2017-03-27 22:29 ` jes.sorensen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).