On 08/07/2014 03:26 AM, Christoph Hellwig wrote:
> We do want to use the dm-multipath device if it exists, which the
> code is generally prepared for, except that this check excludes them
> early. In addition this will also add the passive path to the device
> list, which is harmless if an active one exists as that or the multipath
> device will be preferred, and at least allows us to work if it doesn't.
>
> Also fix up the check if an path needs to be updated to remove the silly
> partition check - pNFS block offset are relative to the device so partion
> should never match it instead of the full device. On the other hand the
> simplistic check easily creates false positives, e.g. dm-10 is considered
> a partition of dm-1.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Committed...
steved.
> ---
> utils/blkmapd/device-discovery.c | 27 ++++-----------------------
> 1 file changed, 4 insertions(+), 23 deletions(-)
>
> diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
> index df4627e..bcfb060 100644
> --- a/utils/blkmapd/device-discovery.c
> +++ b/utils/blkmapd/device-discovery.c
> @@ -77,16 +77,6 @@ struct bl_disk_path *bl_get_path(const char *filepath,
> return tmp;
> }
>
> -/* Check whether valid_path is a substring(partition) of path */
> -int bl_is_partition(struct bl_disk_path *valid_path, struct bl_disk_path *path)
> -{
> - if (!strncmp(valid_path->full_path, path->full_path,
> - strlen(valid_path->full_path)))
> - return 1;
> -
> - return 0;
> -}
> -
> /*
> * For multipath devices, devices state could be PASSIVE/ACTIVE/PSEUDO,
> * where PSEUDO > ACTIVE > PASSIVE. Device with highest state is used to
> @@ -95,19 +85,13 @@ int bl_is_partition(struct bl_disk_path *valid_path, struct bl_disk_path *path)
> * If device-mapper multipath support is a must, pseudo devices should
> * exist for each multipath device. If not, active device path will be
> * chosen for device creation.
> - * Treat partition as invalid path.
> */
> -int bl_update_path(struct bl_disk_path *path, enum bl_path_state_e state,
> - struct bl_disk *disk)
> +int bl_update_path(enum bl_path_state_e state, struct bl_disk *disk)
> {
> struct bl_disk_path *valid_path = disk->valid_path;
>
> - if (valid_path) {
> - if (valid_path->state >= state) {
> - if (bl_is_partition(valid_path, path))
> - return 0;
> - }
> - }
> + if (valid_path && valid_path->state >= state)
> + return 0;
> return 1;
> }
>
> @@ -170,9 +154,6 @@ void bl_add_disk(char *filepath)
> ap_state = bldev_read_ap_state(fd);
> close(fd);
>
> - if (ap_state != BL_PATH_STATE_ACTIVE)
> - return;
> -
> for (disk = visible_disk_list; disk != NULL; disk = disk->next) {
> /* Already scanned or a partition?
> * XXX: if released each time, maybe not need to compare
> @@ -216,7 +197,7 @@ void bl_add_disk(char *filepath)
> path->next = disk->paths;
> disk->paths = path;
> /* check whether we need to update disk info */
> - if (bl_update_path(path, path->state, disk)) {
> + if (bl_update_path(path->state, disk)) {
> disk->dev = dev;
> disk->size = size;
> disk->valid_path = path;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
