udev: Move udev_block() and udev_unblock() into udev.c
PATCH v4 2/2 udev: Move udev_block() and udev_unblock() into udev.c
Add kernel style comments and better error handling.
Signed-off-by Mateusz Grzonka <[email protected]>
--- Create.c | 1 + lib.c | 29 ----------------------------- mdadm.h | 2 -- mdopen.c | 12 ++++++------ udev.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ udev.h | 3 +++ 6 files changed, 54 insertions(+), 37 deletions(-)
Create.c +1 -0
@@ -23,6 +23,7 @@*/ #include "mdadm.h" +#include "udev.h" #include "md_u.h" #include "md_p.h" #include <ctype.h>
lib.c +0 -29
@@ -186,35 +186,6 @@ char *fd2devnm(int fd)return NULL ; } -/* When we create a new array, we don't want the content to -* be immediately examined by udev - it is probably meaningless. -* So create /run/mdadm/creating-mdXXX and expect that a udev -* rule will noticed this and act accordingly. -*/ -static char block_path[] ="/run/mdadm/creating-%s" ; -static char *unblock_path =NULL ; -void udev_block (char *devnm) -{ -int fd; -char *path =NULL ; - -xasprintf (&path, block_path, devnm); - fd =open (path,O_CREAT |O_RDWR ,0600 ); -if (fd >=0 ) { -close (fd); - unblock_path = path; - }else -free (path); -} - -void udev_unblock (void ) -{ -if (unblock_path) -unlink (unblock_path); -free (unblock_path); - unblock_path =NULL ; -} -/* * convert a major/minor pair for a block device into a name in /dev, if possible. * On the first call, walk /dev collecting name.
mdadm.h +0 -2
@@ -1755,8 +1755,6 @@ extern char *fd2kname(int fd);extern char *stat2devnm (struct stat *st);bool stat_is_md_dev (struct stat *st);extern char *fd2devnm (int fd); -extern void udev_block (char *devnm); -extern void udev_unblock (void );extern int in_initrd (void );
mdopen.c +6 -6
@@ -336,8 +336,8 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, devnm[0 ] =0 ;if (num <0 && cname && ci->names) {sprintf (devnm,"md_%s" , cname); -if (block_udev) -udev_block (devnm); +if (block_udev &&udev_block (devnm) !=UDEV_STATUS_SUCCESS ) +return -1 ;if (!create_named_array (devnm)) { devnm[0 ] =0 ;udev_unblock ();
@@ -345,8 +345,8 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, }if (num >=0 ) {sprintf (devnm,"md%d" , num); -if (block_udev) -udev_block (devnm); +if (block_udev &&udev_block (devnm) !=UDEV_STATUS_SUCCESS ) +return -1 ;if (!create_named_array (devnm)) { devnm[0 ] =0 ;udev_unblock ();
@@ -369,8 +369,8 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,return -1 ; } } -if (block_udev) -udev_block (devnm); +if (block_udev &&udev_block (devnm) !=UDEV_STATUS_SUCCESS ) +return -1 ;create_named_array (devnm); }
udev.c +44 -0
53 lines not on this page · raw message
udev.h +3 -0
@@ -34,4 +34,7 @@ bool udev_is_available(void);enum udev_status udev_wait_for_events (int seconds);#endif +enum udev_status udev_block (char *devnm); +void udev_unblock (void ); +#endif
Signature · 1 line
2.26.2