shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Make error message hit when preallocated memlock memory exceeded clearer.

Browse Source
This commit is contained in:
Alasdair Kergon 2012-01-12 18:29:07 +00:00
parent 8f95d94b4f
commit a7d2f7795a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.89 - Version 2.02.89 -
================================== ==================================
Make error message hit when preallocated memlock memory exceeded clearer.
Use R lv_attr to indicate read-only activation of non-read-only device in lvs. Use R lv_attr to indicate read-only activation of non-read-only device in lvs.
Show read-only activation override in lvdisplay & add 4 to perms in -c. Show read-only activation override in lvdisplay & add 4 to perms in -c.
Add activation/read_only_volume_list to override LV permission in metadata. Add activation/read_only_volume_list to override LV permission in metadata.

4
lib/mm/memlock.c
View File

@ -147,7 +147,7 @@ static void _release_memory(void)
* format described in kernel/Documentation/filesystem/proc.txt * format described in kernel/Documentation/filesystem/proc.txt
*/ */
static int _maps_line(const struct dm_config_node *cn, lvmlock_t lock, static int _maps_line(const struct dm_config_node *cn, lvmlock_t lock,
const char* line, size_t* mstats) const char *line, size_t *mstats)
{ {
const struct dm_config_value *cv; const struct dm_config_value *cv;
long from, to; long from, to;
@ -357,7 +357,7 @@ static void _unlock_mem(struct cmd_context *cmd)
if (_mstats < unlock_mstats) { if (_mstats < unlock_mstats) {
if ((_mstats + lvm_getpagesize()) < unlock_mstats) if ((_mstats + lvm_getpagesize()) < unlock_mstats)
log_error(INTERNAL_ERROR log_error(INTERNAL_ERROR
"Maps lock %ld < unlock %ld", "Reserved memory (%ld) not enough: used %ld. Increase activation/reserved_memory?",
(long)_mstats, (long)unlock_mstats); (long)_mstats, (long)unlock_mstats);
else else
/* FIXME Believed due to incorrect use of yes_no_prompt while locks held */ /* FIXME Believed due to incorrect use of yes_no_prompt while locks held */