Remove unused device error counting

diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index a76c68d8de2b5b240a816a2074bd4f51d03f374e..723f8828feacbc10ecc93cfce7cab8e5a4cada43 100644 (file)
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -974,9 +974,6 @@ static int _init_dev_cache(struct cmd_context *cmd)
        int len_diff;
        int device_list_from_udev;
 
-       init_dev_disable_after_error_count(
-               find_config_tree_int(cmd, devices_disable_after_error_count_CFG, NULL));
-
        if (!dev_cache_init(cmd))
                return_0;
 

diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index ff098d832dc5b68f3de30b6dc8e915292e2025d8..ac0f0ff5d12a25ab1ee6bad31c7a2c66cee13c29 100644 (file)
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -410,12 +410,8 @@ cfg(devices_ignore_lvm_mirrors_CFG, "ignore_lvm_mirrors", devices_CFG_SECTION, 0
        "apply to LVM RAID types like 'raid1' which handle failures in a\n"
        "different way, making them a better choice for VG stacking.\n")
 
-cfg(devices_disable_after_error_count_CFG, "disable_after_error_count", devices_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_DISABLE_AFTER_ERROR_COUNT, vsn(2, 2, 75), NULL, 0, NULL,
-       "Number of I/O errors after which a device is skipped.\n"
-       "During each LVM operation, errors received from each device are\n"
-       "counted. If the counter of a device exceeds the limit set here,\n"
-       "no further I/O is sent to that device for the remainder of the\n"
-       "operation. Setting this to 0 disables the counters altogether.\n")
+cfg(devices_disable_after_error_count_CFG, "disable_after_error_count", devices_CFG_SECTION, 0, CFG_TYPE_INT, 0, vsn(2, 2, 75), NULL, vsn(3, 0, 0), NULL,
+       "This setting is no longer used.\n")
 
 cfg(devices_require_restorefile_with_uuid_CFG, "require_restorefile_with_uuid", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_REQUIRE_RESTOREFILE_WITH_UUID, vsn(2, 2, 73), NULL, 0, NULL,
        "Allow use of pvcreate --uuid without requiring --restorefile.\n")

diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index 7cebd84818cf324dabbc4667a04817967fcfdf6d..084d3652d12c739edb03971b38cb5f5d32ab3f54 100644 (file)
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -39,7 +39,6 @@
 #define DEFAULT_IGNORE_LVM_MIRRORS 1
 #define DEFAULT_MULTIPATH_COMPONENT_DETECTION 1
 #define DEFAULT_IGNORE_SUSPENDED_DEVICES 0
-#define DEFAULT_DISABLE_AFTER_ERROR_COUNT 0
 #define DEFAULT_REQUIRE_RESTOREFILE_WITH_UUID 1
 #define DEFAULT_DATA_ALIGNMENT_OFFSET_DETECTION 1
 #define DEFAULT_DATA_ALIGNMENT_DETECTION 1
@@ -206,8 +205,6 @@
 
 #define DEFAULT_MAX_HISTORY 100
 
-#define DEFAULT_MAX_ERROR_COUNT        NO_DEV_ERROR_COUNT_LIMIT
-
 #define DEFAULT_REP_COMPACT_OUTPUT 0
 #define DEFAULT_REP_ALIGNED 1
 #define DEFAULT_REP_BUFFERED 1

diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c
index 1635c99a1109ba902347a8a9cc9fc4175f56de14..a0d98a33697f0f1505bbc546799e99b449b7e2a3 100644 (file)
--- a/lib/device/dev-cache.c
+++ b/lib/device/dev-cache.c
@@ -62,13 +62,12 @@ static int _insert(const char *path, const struct stat *info,
                   int rec, int check_with_udev_db);
 
 /* Setup non-zero members of passed zeroed 'struct device' */
-static void _dev_init(struct device *dev, int max_error_count)
+static void _dev_init(struct device *dev)
 {
        dev->phys_block_size = -1;
        dev->block_size = -1;
        dev->fd = -1;
        dev->read_ahead = -1;
-       dev->max_error_count = max_error_count;
 
        dev->ext.enabled = 0;
        dev->ext.src = DEV_EXT_NONE;
@@ -129,7 +128,7 @@ struct device *dev_create_file(const char *filename, struct device *dev,
                return NULL;
        }
 
-       _dev_init(dev, NO_DEV_ERROR_COUNT_LIMIT);
+       _dev_init(dev);
        dev->flags = DEV_REGULAR | ((use_malloc) ? DEV_ALLOCED : 0);
        dm_list_add(&dev->aliases, &alias->list);
 
@@ -145,7 +144,7 @@ static struct device *_dev_create(dev_t d)
                return NULL;
        }
 
-       _dev_init(dev, dev_disable_after_error_count());
+       _dev_init(dev);
        dev->dev = d;
 
        return dev;
@@ -1690,18 +1689,6 @@ struct device *dev_iter_get(struct cmd_context *cmd, struct dev_iter *iter)
        return NULL;
 }
 
-void dev_reset_error_count(struct cmd_context *cmd)
-{
-       struct dev_iter iter;
-
-       if (!_cache.devices)
-               return;
-
-       iter.current = btree_first(_cache.devices);
-       while (iter.current)
-               _iter_next(&iter)->error_count = 0;
-}
-
 int dev_fd(struct device *dev)
 {
        return dev->fd;

diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c
index ffdf75e17da77a82c404e329ef4076be709d757c..43c2c2d273b126d0dbd0ec6893b245c85b55288c 100644 (file)
--- a/lib/device/dev-io.c
+++ b/lib/device/dev-io.c
@@ -689,20 +689,6 @@ int dev_close_immediate(struct device *dev)
        return _dev_close(dev, 1);
 }
 
-static inline int _dev_is_valid(struct device *dev)
-{
-       return (dev->max_error_count == NO_DEV_ERROR_COUNT_LIMIT ||
-               dev->error_count < dev->max_error_count);
-}
-
-static void _dev_inc_error_count(struct device *dev)
-{
-       if (++dev->error_count == dev->max_error_count)
-               log_warn("WARNING: Error counts reached a limit of %d. "
-                        "Device %s was disabled",
-                        dev->max_error_count, dev_name(dev));
-}
-
 int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer)
 {
        struct device_area where;
@@ -711,16 +697,11 @@ int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t re
        if (!dev->open_count)
                return_0;
 
-       if (!_dev_is_valid(dev))
-               return 0;
-
        where.dev = dev;
        where.start = offset;
        where.size = len;
 
        ret = _aligned_io(&where, buffer, 0, reason);
-       if (!ret)
-               _dev_inc_error_count(dev);
 
        return ret;
 }
@@ -783,9 +764,6 @@ int dev_write(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t r
        if (!dev->open_count)
                return_0;
 
-       if (!_dev_is_valid(dev))
-               return 0;
-
        if (!len) {
                log_error(INTERNAL_ERROR "Attempted to write 0 bytes to %s at " FMTu64, dev_name(dev), offset);
                return 0;
@@ -798,8 +776,6 @@ int dev_write(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t r
        dev->flags |= DEV_ACCESSED_W;
 
        ret = _aligned_io(&where, buffer, 1, reason);
-       if (!ret)
-               _dev_inc_error_count(dev);
 
        return ret;
 }

diff --git a/lib/device/device.h b/lib/device/device.h
index 8f9ed558eaa20bbb4a0d295cac2ef6cf5fa1bf3f..00e398add2132f5eba2542a84b39d315a7f2b331 100644 (file)
--- a/lib/device/device.h
+++ b/lib/device/device.h
@@ -64,8 +64,6 @@ struct device {
        /* private */
        int fd;
        int open_count;
-       int error_count;
-       int max_error_count;
        int phys_block_size;
        int block_size;
        int read_ahead;

diff --git a/lib/misc/lvm-globals.c b/lib/misc/lvm-globals.c
index 937758841374b483bdf800c53794e05d0d0d0214..86e6cf49ffd8a6b3dff2bed20fd0453196cd76cd 100644 (file)
--- a/lib/misc/lvm-globals.c
+++ b/lib/misc/lvm-globals.c
@@ -49,7 +49,6 @@ static int _udev_checking = 1;
 static int _retry_deactivation = DEFAULT_RETRY_DEACTIVATION;
 static int _activation_checks = 0;
 static char _sysfs_dir_path[PATH_MAX] = "";
-static int _dev_disable_after_error_count = DEFAULT_DISABLE_AFTER_ERROR_COUNT;
 static uint64_t _pv_min_size = (DEFAULT_PV_MIN_SIZE_KB * 1024L >> SECTOR_SHIFT);
 static const char *_unknown_device_name = DEFAULT_UNKNOWN_DEVICE_NAME;
 
@@ -173,11 +172,6 @@ void init_activation_checks(int checks)
                log_debug_activation("LVM activation checks disabled");
 }
 
-void init_dev_disable_after_error_count(int value)
-{
-       _dev_disable_after_error_count = value;
-}
-
 void init_pv_min_size(uint64_t sectors)
 {
        _pv_min_size = sectors;
@@ -345,11 +339,6 @@ const char *sysfs_dir_path(void)
        return _sysfs_dir_path;
 }
 
-int dev_disable_after_error_count(void)
-{
-       return _dev_disable_after_error_count;
-}
-
 uint64_t pv_min_size(void)
 {
        return _pv_min_size;

diff --git a/lib/misc/lvm-globals.h b/lib/misc/lvm-globals.h
index 55a9399c6d71d712ab35e590b5f0219aca16c8d6..6fc26ccc47aa1f516c36be586f6fe84e9d9a8f4e 100644 (file)
--- a/lib/misc/lvm-globals.h
+++ b/lib/misc/lvm-globals.h
@@ -45,7 +45,6 @@ void init_ignore_lvm_mirrors(int scan);
 void init_error_message_produced(int produced);
 void init_is_static(unsigned value);
 void init_udev_checking(int checking);
-void init_dev_disable_after_error_count(int value);
 void init_pv_min_size(uint64_t sectors);
 void init_activation_checks(int checks);
 void init_retry_deactivation(int retry);
@@ -84,7 +83,4 @@ const char *unknown_device_name(void);
 #define DMEVENTD_MONITOR_IGNORE -1
 int dmeventd_monitor_mode(void);
 
-#define NO_DEV_ERROR_COUNT_LIMIT 0
-int dev_disable_after_error_count(void);
-
 #endif