lvm2/use-mirrortype-asdefault-whenclvmdrunning.patch
LiuhuaMelody Wang 97abc4b700 Accepting request 263775 from home:jeff_mahoney:branches:Base:System
- Update to 2.02.114
  - Removed cmirrord-fix-s390-endian-issue.patch
  - Renumbered patches to allow for upstream patches to be applied
    before local ones.

OBS-URL: https://build.opensuse.org/request/show/263775
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=111
2014-12-04 06:08:29 +00:00

45 lines
1.2 KiB
Diff

---
tools/lvcreate.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -834,6 +834,28 @@ static int _read_activation_params(struc
return 1;
}
+static int clvmd_daemon_is_running(void)
+{
+ int fd;
+ struct flock lock;
+
+ if((fd = open(CLVMD_PIDFILE, O_RDONLY)) < 0)
+ return 0;
+
+ lock.l_type = F_WRLCK;
+ lock.l_start = 0;
+ lock.l_whence = SEEK_SET;
+ lock.l_len = 0;
+ if (fcntl(fd, F_GETLK, &lock) < 0) {
+ /* errors with fcntl */
+ close(fd);
+ return 0;
+ }
+
+ close(fd);
+ return (lock.l_type == F_UNLCK) ? 0 : 1;
+}
+
static int _lvcreate_params(struct cmd_context *cmd,
int argc, char **argv,
struct lvcreate_params *lp,
@@ -860,6 +882,8 @@ static int _lvcreate_params(struct lvcre
mirror_default_cfg = (arg_uint_value(cmd, stripes_ARG, 1) > 1)
? global_raid10_segtype_default_CFG : global_mirror_segtype_default_CFG;
segtype_str = find_config_tree_str(cmd, mirror_default_cfg, NULL);
+ if(clvmd_daemon_is_running())
+ segtype_str = "mirror";
} else
segtype_str = "striped";