read_ahead node ops

diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 392ed8a87682301afd33b72aba61719532bf3cb6..f44839a1cdbde060aafd4d7808f62ed3068f5acb 100644 (file)
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -920,12 +920,9 @@ int dm_task_get_info(struct dm_task *dmt, struct dm_info *info)
        return 1;
 }
 
-uint32_t dm_task_get_read_ahead(const struct dm_task *dmt)
+uint32_t dm_task_get_read_ahead(const struct dm_task *dmt, uint32_t *read_ahead)
 {              
-       uint32_t read_ahead = 0; //FIXME default?  How cope with failure below?
-       // FIXME (void) dm_blockdev_get_read_ahead(dmt->dev_name, &read_ahead);
-
-       return read_ahead;
+       return get_dev_node_read_ahead(dmt->dev_name, read_ahead);
 }
 
 const char *dm_task_get_name(const struct dm_task *dmt)
@@ -1685,6 +1682,11 @@ repeat_ioctl:
                        rename_dev_node(dmt->dev_name, dmt->newname);
                break;
 
+       case DM_DEVICE_RESUME:
+               set_dev_node_read_ahead(dmi->name, dmt->read_ahead,
+                                       dmt->read_ahead_flags);
+               break;
+       
        case DM_DEVICE_MKNODES:
                if (dmi->flags & DM_EXISTS_FLAG)
                        add_dev_node(dmi->name, MAJOR(dmi->dev),

diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index b3d2b077835bd459364a094fce7673fe00ca3e42..7e9810a3303d9ffab0b37b2b6d6fd9829797ddda 100644 (file)
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -167,7 +167,8 @@ int dm_task_suppress_identical_reload(struct dm_task *dmt);
 
 int dm_task_set_read_ahead(struct dm_task *dmt, uint32_t read_ahead,
                           uint32_t read_ahead_flags);
-uint32_t dm_task_get_read_ahead(const struct dm_task *dmt);
+uint32_t dm_task_get_read_ahead(const struct dm_task *dmt,
+                               uint32_t *read_ahead);
 
 /*
  * Use these to prepare for a create or reload.

diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index f521db174645a039c9a72b2d0cd3067047556413..9285f911b1e807869c94254dd32ce834b0c1474e 100644 (file)
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -356,15 +356,55 @@ static int _rm_dev_node(const char *dev_name)
        return 1;
 }
 
+int get_dev_node_read_ahead(const char *dev_name, uint32_t *read_ahead)
+{
+       *read_ahead = 0;
+
+       return 1;
+}
+
+static int _set_read_ahead(const char *dev_name, uint32_t read_ahead)
+{
+       return 1;
+}
+
+static int _set_dev_node_read_ahead(const char *dev_name, uint32_t read_ahead,
+                                   uint32_t read_ahead_flags)
+{
+       uint32_t current_read_ahead;
+
+       if (read_ahead == DM_READ_AHEAD_AUTO)
+               return 1;
+
+       if (read_ahead == DM_READ_AHEAD_NONE)
+               read_ahead = 0;
+
+       if (read_ahead_flags & DM_READ_AHEAD_MINIMUM_FLAG) {
+               if (!get_dev_node_read_ahead(dev_name, &current_read_ahead))
+                       return_0;
+
+               if (current_read_ahead > read_ahead) {
+                       log_debug("%s: read ahead %" PRIu32
+                                 " below minimum of %" PRIu32,
+                                 dev_name, current_read_ahead, read_ahead);
+                       return 1;
+               }
+       }
+
+       return _set_read_ahead(dev_name, read_ahead);
+}
+
 typedef enum {
        NODE_ADD,
        NODE_DEL,
-       NODE_RENAME
+       NODE_RENAME,
+       NODE_READ_AHEAD
 } node_op_t;
 
 static int _do_node_op(node_op_t type, const char *dev_name, uint32_t major,
                       uint32_t minor, uid_t uid, gid_t gid, mode_t mode,
-                      const char *old_name)
+                      const char *old_name, uint32_t read_ahead,
+                      uint32_t read_ahead_flags)
 {
        switch (type) {
        case NODE_ADD:
@@ -373,6 +413,9 @@ static int _do_node_op(node_op_t type, const char *dev_name, uint32_t major,
                return _rm_dev_node(dev_name);
        case NODE_RENAME:
                return _rename_dev_node(old_name, dev_name);
+       case NODE_READ_AHEAD:
+               return _set_dev_node_read_ahead(dev_name, read_ahead,
+                                               read_ahead_flags);
        }
 
        return 1;
@@ -389,6 +432,8 @@ struct node_op_parms {
        uid_t uid;
        gid_t gid;
        mode_t mode;
+       uint32_t read_ahead;
+       uint32_t read_ahead_flags;
        char *old_name;
        char names[0];
 };
@@ -402,7 +447,8 @@ static void _store_str(char **pos, char **ptr, const char *str)
 
 static int _stack_node_op(node_op_t type, const char *dev_name, uint32_t major,
                          uint32_t minor, uid_t uid, gid_t gid, mode_t mode,
-                         const char *old_name)
+                         const char *old_name, uint32_t read_ahead,
+                         uint32_t read_ahead_flags)
 {
        struct node_op_parms *nop;
        size_t len = strlen(dev_name) + strlen(old_name) + 2;
@@ -420,6 +466,8 @@ static int _stack_node_op(node_op_t type, const char *dev_name, uint32_t major,
        nop->uid = uid;
        nop->gid = gid;
        nop->mode = mode;
+       nop->read_ahead = read_ahead;
+       nop->read_ahead_flags = read_ahead_flags;
 
        _store_str(&pos, &nop->dev_name, dev_name);
        _store_str(&pos, &nop->old_name, old_name);
@@ -437,7 +485,8 @@ static void _pop_node_ops(void)
        list_iterate_safe(noph, nopht, &_node_ops) {
                nop = list_item(noph, struct node_op_parms);
                _do_node_op(nop->type, nop->dev_name, nop->major, nop->minor,
-                           nop->uid, nop->gid, nop->mode, nop->old_name);
+                           nop->uid, nop->gid, nop->mode, nop->old_name,
+                           nop->read_ahead, nop->read_ahead_flags);
                list_del(&nop->list);
                dm_free(nop);
        }
@@ -447,17 +496,28 @@ int add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
                 uid_t uid, gid_t gid, mode_t mode)
 {
        return _stack_node_op(NODE_ADD, dev_name, major, minor, uid, gid, mode,
-                             "");
+                             "", 0, 0);
 }
 
 int rename_dev_node(const char *old_name, const char *new_name)
 {
-       return _stack_node_op(NODE_RENAME, new_name, 0, 0, 0, 0, 0, old_name);
+       return _stack_node_op(NODE_RENAME, new_name, 0, 0, 0, 0, 0, old_name,
+                             0, 0);
 }
 
 int rm_dev_node(const char *dev_name)
 {
-       return _stack_node_op(NODE_DEL, dev_name, 0, 0, 0, 0, 0, "");
+       return _stack_node_op(NODE_DEL, dev_name, 0, 0, 0, 0, 0, "", 0, 0);
+}
+
+int set_dev_node_read_ahead(const char *dev_name, uint32_t read_ahead,
+                           uint32_t read_ahead_flags)
+{
+       if (read_ahead == DM_READ_AHEAD_AUTO)
+               return 1;
+
+       return _stack_node_op(NODE_READ_AHEAD, dev_name, 0, 0, 0, 0, 0, "",
+                             read_ahead, read_ahead_flags);
 }
 
 void update_devs(void)

diff --git a/libdm/libdm-common.h b/libdm/libdm-common.h
index 9fefa4451c4e5aa63a739c66b5687538691db2bf..9f11902eec9a1d3ea4929c141456de24d543e9e6 100644 (file)
--- a/libdm/libdm-common.h
+++ b/libdm/libdm-common.h
@@ -26,6 +26,9 @@ int add_dev_node(const char *dev_name, uint32_t minor, uint32_t major,
                 uid_t uid, gid_t gid, mode_t mode);
 int rm_dev_node(const char *dev_name);
 int rename_dev_node(const char *old_name, const char *new_name);
+int get_dev_node_read_ahead(const char *dev_name, uint32_t *read_ahead);
+int set_dev_node_read_ahead(const char *dev_name, uint32_t read_ahead,
+                           uint32_t read_ahead_flags);
 void update_devs(void);
 
 #endif

diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index 572fe596ea94b899f1e1f897e96484a2f0e9013c..97099c0011ed5a2ac56c94e17696ab92561c7bb2 100644 (file)
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -326,6 +326,7 @@ static int _display_info_cols(struct dm_task *dmt, struct dm_info *info)
 static void _display_info_long(struct dm_task *dmt, struct dm_info *info)
 {
        const char *uuid;
+       uint32_t read_ahead;
 
        if (!info->exists) {
                printf("Device does not exist.\n");
@@ -338,7 +339,8 @@ static void _display_info_long(struct dm_task *dmt, struct dm_info *info)
               info->suspended ? "SUSPENDED" : "ACTIVE",
               info->read_only ? " (READ-ONLY)" : "");
 
-       printf("Read Ahead:       %d\n", (int) dm_task_get_read_ahead(dmt));
+       if (dm_task_get_read_ahead(dmt, &read_ahead))
+               printf("Read Ahead:       %" PRIu32 "\n", read_ahead);
 
        if (!info->live_table && !info->inactive_table)
                printf("Tables present:    None\n");
@@ -1613,9 +1615,12 @@ static int _dm_read_ahead_disp(struct dm_report *rh,
                               struct dm_report_field *field, const void *data,
                               void *private __attribute((unused)))
 {
-       int32_t value = (int32_t) dm_task_get_read_ahead((const struct dm_task *) data);
+       uint32_t value;
 
-       return dm_report_field_int32(rh, field, &value);
+       if (!dm_task_get_read_ahead((const struct dm_task *) data, &value))
+               value = 0;
+
+       return dm_report_field_uint32(rh, field, &value);
 }
 
 static int _dm_info_status_disp(struct dm_report *rh,