shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

Remove lvmcache CACHE_LOCKED flag

Browse Source 
and the functions that set it.  It's no longer used.
This commit is contained in:
David Teigland 2018-06-08 15:11:47 -05:00
parent ebd147ff24
commit b48e10d9e6
1 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/cache/lvmcache.c vendored
View File

@ -28,8 +28,6 @@
#include "lib/cache/lvmetad.h" #include "lib/cache/lvmetad.h"
#include "daemons/lvmetad/lvmetad-client.h" #include "daemons/lvmetad/lvmetad-client.h"
#define CACHE_LOCKED 0x00000002
/* One per device */ /* One per device */
struct lvmcache_info { struct lvmcache_info {
struct dm_list list; /* Join VG members together */ struct dm_list list; /* Join VG members together */
@ -131,33 +129,6 @@ void lvmcache_seed_infos_from_lvmetad(struct cmd_context *cmd)
_has_scanned = 1; _has_scanned = 1;
} }
static void _update_cache_info_lock_state(struct lvmcache_info *info, int locked)
{
if (locked)
info->status |= CACHE_LOCKED;
else
info->status &= ~CACHE_LOCKED;
}
static void _update_cache_vginfo_lock_state(struct lvmcache_vginfo *vginfo,
int locked)
{
struct lvmcache_info *info;
dm_list_iterate_items(info, &vginfo->infos)
_update_cache_info_lock_state(info, locked);
}
static void _update_cache_lock_state(const char *vgname, int locked)
{
struct lvmcache_vginfo *vginfo;
if (!(vginfo = lvmcache_vginfo_from_vgname(vgname, NULL)))
return;
_update_cache_vginfo_lock_state(vginfo, locked);
}
void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unused))) void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unused)))
{ {
if (dm_hash_lookup(_lock_hash, vgname)) if (dm_hash_lookup(_lock_hash, vgname))
@ -167,10 +138,8 @@ void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unuse
if (!dm_hash_insert(_lock_hash, vgname, (void *) 1)) if (!dm_hash_insert(_lock_hash, vgname, (void *) 1))
log_error("Cache locking failure for %s", vgname); log_error("Cache locking failure for %s", vgname);
if (strcmp(vgname, VG_GLOBAL)) { if (strcmp(vgname, VG_GLOBAL))
_update_cache_lock_state(vgname, 1);
_vgs_locked++; _vgs_locked++;
}
} }
int lvmcache_vgname_is_locked(const char *vgname) int lvmcache_vgname_is_locked(const char *vgname)
@ -187,9 +156,6 @@ void lvmcache_unlock_vgname(const char *vgname)
log_error(INTERNAL_ERROR "Attempt to unlock unlocked VG %s.", log_error(INTERNAL_ERROR "Attempt to unlock unlocked VG %s.",
vgname); vgname);
if (strcmp(vgname, VG_GLOBAL))
_update_cache_lock_state(vgname, 0);
dm_hash_remove(_lock_hash, vgname); dm_hash_remove(_lock_hash, vgname);
/* FIXME Do this per-VG */ /* FIXME Do this per-VG */
@ -1513,8 +1479,6 @@ static int _lvmcache_update_vgname(struct lvmcache_info *info,
else if (!_lvmcache_update_vgid(NULL, vginfo, vgid)) /* Orphans */ else if (!_lvmcache_update_vgid(NULL, vginfo, vgid)) /* Orphans */
return_0; return_0;
_update_cache_vginfo_lock_state(vginfo, lvmcache_vgname_is_locked(vgname));
/* FIXME Check consistency of list! */ /* FIXME Check consistency of list! */
vginfo->fmt = fmt; vginfo->fmt = fmt;