diff options
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 110 |
1 files changed, 65 insertions, 45 deletions
@@ -35,7 +35,6 @@ #include <poll.h> #include <ctype.h> #include <dirent.h> -#include <signal.h> #include <dlfcn.h> @@ -167,7 +166,7 @@ retry: pr_err("error %d when get PW mode on lock %s\n", errno, str); /* let's try several times if EAGAIN happened */ if (dlm_lock_res->lksb.sb_status == EAGAIN && retry_count < 10) { - sleep(10); + sleep_for(10, 0, true); retry_count++; goto retry; } @@ -268,7 +267,7 @@ int md_array_active(int fd) * GET_ARRAY_INFO doesn't provide access to the proper state * information, so fallback to a basic check for raid_disks != 0 */ - ret = ioctl(fd, GET_ARRAY_INFO, &array); + ret = md_get_array_info(fd, &array); } return !ret; @@ -969,47 +968,30 @@ dev_t devnm2devid(char *devnm) return 0; } +/** + * get_md_name() - Get main dev node of the md device. + * @devnm: Md device name or path. + * + * Function checks if the full name was passed and returns md name + * if it is the MD device. + * + * Return: Main dev node of the md device or NULL if not found. + */ char *get_md_name(char *devnm) { - /* find /dev/md%d or /dev/md/%d or make a device /dev/.tmp.md%d */ - /* if dev < 0, want /dev/md/d%d or find mdp in /proc/devices ... */ - - static char devname[50]; + static char devname[NAME_MAX]; struct stat stb; - dev_t rdev = devnm2devid(devnm); - char *dn; - if (rdev == 0) - return 0; - if (strncmp(devnm, "md_", 3) == 0) { - snprintf(devname, sizeof(devname), "/dev/md/%s", - devnm + 3); - if (stat(devname, &stb) == 0 && - (S_IFMT&stb.st_mode) == S_IFBLK && (stb.st_rdev == rdev)) - return devname; - } - snprintf(devname, sizeof(devname), "/dev/%s", devnm); - if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK && - (stb.st_rdev == rdev)) - return devname; + if (strncmp(devnm, "/dev/", 5) == 0) + snprintf(devname, sizeof(devname), "%s", devnm); + else + snprintf(devname, sizeof(devname), "/dev/%s", devnm); - snprintf(devname, sizeof(devname), "/dev/md/%s", devnm+2); - if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK && - (stb.st_rdev == rdev)) + if (!is_mddev(devname)) + return NULL; + if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK) return devname; - dn = map_dev(major(rdev), minor(rdev), 0); - if (dn) - return dn; - snprintf(devname, sizeof(devname), "/dev/.tmp.%s", devnm); - if (mknod(devname, S_IFBLK | 0600, rdev) == -1) - if (errno != EEXIST) - return NULL; - - if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK && - (stb.st_rdev == rdev)) - return devname; - unlink(devname); return NULL; } @@ -1028,6 +1010,20 @@ int get_maj_min(char *dev, int *major, int *minor) *e == 0); } +/** + * is_bit_set() - get bit value by index. + * @val: value. + * @index: index of the bit (LSB numbering). + * + * Return: bit value. + */ +bool is_bit_set(int *val, unsigned char index) +{ + if ((*val) & (1 << index)) + return true; + return false; +} + int dev_open(char *dev, int flags) { /* like 'open', but if 'dev' matches %d:%d, create a temp @@ -1086,7 +1082,7 @@ int open_dev_excl(char *devnm) int i; int flags = O_RDWR; dev_t devid = devnm2devid(devnm); - long delay = 1000; + unsigned int delay = 1; // miliseconds sprintf(buf, "%d:%d", major(devid), minor(devid)); for (i = 0; i < 25; i++) { @@ -1099,8 +1095,8 @@ int open_dev_excl(char *devnm) } if (errno != EBUSY) return fd; - usleep(delay); - if (delay < 200000) + sleep_for(0, MSEC_TO_NSEC(delay), true); + if (delay < 200) delay *= 2; } return -1; @@ -1124,7 +1120,7 @@ void wait_for(char *dev, int fd) { int i; struct stat stb_want; - long delay = 1000; + unsigned int delay = 1; // miliseconds if (fstat(fd, &stb_want) != 0 || (stb_want.st_mode & S_IFMT) != S_IFBLK) @@ -1136,8 +1132,8 @@ void wait_for(char *dev, int fd) (stb.st_mode & S_IFMT) == S_IFBLK && (stb.st_rdev == stb_want.st_rdev)) return; - usleep(delay); - if (delay < 200000) + sleep_for(0, MSEC_TO_NSEC(delay), true); + if (delay < 200) delay *= 2; } if (i == 25) @@ -1822,7 +1818,7 @@ int hot_remove_disk(int mdfd, unsigned long dev, int force) while ((ret = ioctl(mdfd, HOT_REMOVE_DISK, dev)) == -1 && errno == EBUSY && cnt-- > 0) - usleep(10000); + sleep_for(0, MSEC_TO_NSEC(10), true); return ret; } @@ -1835,7 +1831,7 @@ int sys_hot_remove_disk(int statefd, int force) while ((ret = write(statefd, "remove", 6)) == -1 && errno == EBUSY && cnt-- > 0) - usleep(10000); + sleep_for(0, MSEC_TO_NSEC(10), true); return ret == 6 ? 0 : -1; } @@ -2376,3 +2372,27 @@ out: close(fd_zero); return ret; } + +/** + * sleep_for() - Sleeps for specified time. + * @sec: Seconds to sleep for. + * @nsec: Nanoseconds to sleep for, has to be less than one second. + * @wake_after_interrupt: If set, wake up if interrupted. + * + * Function immediately returns if error different than EINTR occurs. + */ +void sleep_for(unsigned int sec, long nsec, bool wake_after_interrupt) +{ + struct timespec delay = {.tv_sec = sec, .tv_nsec = nsec}; + + assert(nsec < MSEC_TO_NSEC(1000)); + + do { + errno = 0; + nanosleep(&delay, &delay); + if (errno != 0 && errno != EINTR) { + pr_err("Error sleeping for %us %ldns: %s\n", sec, nsec, strerror(errno)); + return; + } + } while (!wake_after_interrupt && errno == EINTR); +} |