Allow device major to be set too.

diff --git a/VERSION b/VERSION
index 1b3d7354f8fea94944de1d31f7125916f920fefc..f255e3a0d17cd8ef44c1c0ab78338f5e38b60fb8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.96.09-cvs (2003-03-28)
+0.97.01-cvs (2003-04-02)

diff --git a/lib/.export.sym b/lib/.export.sym
index d68a0489943eed738554244cd33c5e25fcaedcc5..ed14d5a12b30d9d84d59abf537cdeec3a55989ea 100644 (file)
--- a/lib/.export.sym
+++ b/lib/.export.sym
@@ -13,6 +13,7 @@ Base {
                dm_task_get_uuid;
                dm_task_set_ro;
                dm_task_set_newname;
+               dm_task_set_major;
                dm_task_set_minor;
                dm_task_add_target;
                dm_get_next_target;

diff --git a/lib/ioctl/libdevmapper.c b/lib/ioctl/libdevmapper.c
index 75804b8f46a0918ba3e498d87c5c71973e7ef2a9..263ed61d60ca78f4d9e1974da2398bc6e3fcd5bd 100644 (file)
--- a/lib/ioctl/libdevmapper.c
+++ b/lib/ioctl/libdevmapper.c
@@ -238,7 +238,7 @@ static struct dm_ioctl_v1 *_flatten_v1(struct dm_task *dmt)
 
        if (dmt->minor >= 0) {
                dmi->flags |= DM_PERSISTENT_DEV_FLAG;
-               dmi->dev = MKDEV(0, dmt->minor);
+               dmi->dev = MKDEV((dmt->major >= 0) ? : 0, dmt->minor);
        }
 
        if (dmt->uuid)

diff --git a/lib/ioctl/libdm-targets.h b/lib/ioctl/libdm-targets.h
index 210b69d1396de9c6e1f7381bb09d1749588fcc71..96f25c40270b029c1f762b907dfe2824c1c53100 100644 (file)
--- a/lib/ioctl/libdm-targets.h
+++ b/lib/ioctl/libdm-targets.h
@@ -28,6 +28,7 @@ struct dm_task {
        struct target *head, *tail;
 
        int read_only;
+       int major;
        int minor;
        union {
                struct dm_ioctl *v3;

diff --git a/lib/libdevmapper.h b/lib/libdevmapper.h
index 56beb945273a02d8b4e42a1eca51436d1bc4f328..1a865c456673a30ff5b390f825ccb0bd339354dd 100644 (file)
--- a/lib/libdevmapper.h
+++ b/lib/libdevmapper.h
@@ -89,6 +89,7 @@ struct dm_deps *dm_task_get_deps(struct dm_task *dmt);
 int dm_task_set_ro(struct dm_task *dmt);
 int dm_task_set_newname(struct dm_task *dmt, const char *newname);
 int dm_task_set_minor(struct dm_task *dmt, int minor);
+int dm_task_set_major(struct dm_task *dmt, int major);
 
 /*
  * Use these to prepare for a create or reload.

diff --git a/lib/libdm-common.c b/lib/libdm-common.c
index 654e5e58fd4290079b09de9ffe2b42a7b791d8c4..5b39c0e48c3416d19742f5478962902f8609310e 100644 (file)
--- a/lib/libdm-common.c
+++ b/lib/libdm-common.c
@@ -94,6 +94,7 @@ struct dm_task *dm_task_create(int type)
 
        dmt->type = type;
        dmt->minor = -1;
+       dmt->major = -1;
 
        return dmt;
 }
@@ -148,6 +149,14 @@ int dm_task_set_uuid(struct dm_task *dmt, const char *uuid)
        return 1;
 }
 
+int dm_task_set_major(struct dm_task *dmt, int major)
+{
+       dmt->major = major;
+       log_debug("Setting major: %d", dmt->major);
+
+       return 1;
+}
+
 int dm_task_set_minor(struct dm_task *dmt, int minor)
 {
        dmt->minor = minor;