[lvm-devel] [PATCH 11/11] Remove now-unused vg_lock_and_read.

[Dave Wysochanski]

On Mon, 2009-01-12 at 15:08 +0100, Petr Rockai wrote:
> Fri Jan  9 15:48:51 CET 2009  Petr Rockai <me at mornfall.net>
>   * Remove now-unused vg_lock_and_read.
> diff -rN -u -p old-lvmlib_apply/lib/metadata/metadata.c new-lvmlib_apply/lib/metadata/metadata.c
> --- old-lvmlib_apply/lib/metadata/metadata.c	2009-01-12 14:56:03.159015547 +0100
> +++ new-lvmlib_apply/lib/metadata/metadata.c	2009-01-12 14:56:03.219017936 +0100
> @@ -2422,50 +2422,6 @@ int vg_check_status(const struct volume_
>  	return !_vg_check_status(vg, status);
>  }
>  
> -/*
> - * vg_lock_and_read - consolidate vg locking, reading, and status flag checking
> - *
> - * Returns:
> - * NULL - failure
> - * non-NULL - success; volume group handle
> - */
> -vg_t *vg_lock_and_read(struct cmd_context *cmd, const char *vg_name,
> -		       const char *vgid,
> -		       uint32_t lock_flags, uint32_t status_flags,
> -		       uint32_t misc_flags)
> -{
> -	struct volume_group *vg;
> -	int consistent = 1;
> -
> -	if (!(misc_flags & CORRECT_INCONSISTENT))
> -		consistent = 0;
> -
> -	if (!validate_name(vg_name)) {
> -		log_error("Volume group name %s has invalid characters",
> -			  vg_name);
> -		return NULL;
> -	}
> -
> -	if (!lock_vol(cmd, vg_name, lock_flags)) {
> -		log_error("Can't get lock for %s", vg_name);
> -		return NULL;
> -	}
> -
> -	if (!(vg = vg_read_internal(cmd, vg_name, vgid, &consistent)) ||
> -	    ((misc_flags & FAIL_INCONSISTENT) && !consistent)) {
> -		log_error("Volume group \"%s\" not found", vg_name);
> -		unlock_vg(cmd, vg_name);
> -		return NULL;
> -	}
> -
> -	if (!vg_check_status(vg, status_flags)) {
> -		unlock_vg(cmd, vg_name);
> -		return NULL;
> -	}
> -
> -	return vg;
> -}
> -


Please also remove CORRECT_INCONSISTENT and FAIL_INCONSISTENT
definitions with this patch.