lib/merge.c: fix a compiler warningmerge.c: In function 'ploop_merge_snapshot':
merge.c:771: warning: 'ret' may be used uninitialized in this function
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Fix a (bogus?) compiler warningWhen trying to compile with -O2 (gcc 4.7.0, Fedora 17) I get the following
warning (which I believe is bogus):
balloon.c: In function ‘do_ploop_discard’:
balloon.c:888:7: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized]
balloon.c:808:10: note: ‘ret’ was declared here
Note that gcc tells that
* the function is do_ploop_discard()
* the location of the 'ret' decl...
setver.sh: add ability to specify -U or -FSo from now on -i, -U and -F has the same meaning as to rpm
(install, build, freshen).
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Autoconvert to new shapshots dd.xml schemaCommit f2d36d8 changed the snapshots DiskDescriptor.xml schema
to have constant TopGUID. This patch tries to make old schema
automatically converted to the new one, with an appropriate
message to a user, when writing the file.
This should fix "Shapshot is in old format" message.
http://bugzilla.openvz.org/2360
Reported-by: Kalin Bogatzevski <kalin@bul.net>
Signed-off-by: Kir Kolyshkin <kir@op...
ploop info: fix options processing1 Do not rely on optind == 1, use explicit 1 instead
2 Check that we have exactly 1 argument, not more
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
ploop start,stop,clear: check that -d is providedand error out if it's not. Otherwise we get this:
# ploop stop
Can't open device: Bad address
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Block device size should be multiple of cluster blocksize* Added check for correct size
* Round up device size value specified by a user on create and resize
Reference: PSBM-15189
Reference: ploop@801425
tools/ploop-stat.c: don't ignore write() return valueCertain versions of gcc (4.4.6) and glibc (2.12), combined with
certain values in CFLAGS ("-O2 -Wall -Werror -D_FORTIFY_SOURCE=2",
which comes from RPM_OPT_FLAGS supplied by rpmbuild) result in
certain compilation errors, like these:
cc1: warnings being treated as errors
ploop-stat.c: In function 'main':
ploop-stat.c:117: error: ignoring return value of 'write', declared with attribute warn_un...
Fix a few 'result unused' compiler warningsLike this one, emitted by clang:
balloon.c:426:3: error: expression result unused [-Werror,-Wunused-value]
ioctl_device(fd, PLOOP_IOC_BALLOON, &b_ctl);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
ploop_send(): fix an uninitialised variablepcopy.c: In function 'ploop_send':
pcopy.c:293: error: 'mntfd' may be used uninitialized in this function
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
ploop_find_dev(): use read_line_quiet()Doing stat() and then read_line() could fail with EEXIST because
the file is being removed while we try to read it.
Switch to read_line_quiet() and handle EEXIST ourselves.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Introduce read_line_quiet()Same as read_line() but
1 it doesn't print an error message
2 it returns errno value
To be used by the following patches.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
ploop_find_dev(): remove an unneeded consistency checkCheck of consistency between /sys/block/%s/dev and /dev/%s
was redundant, remove it.
[kir@openvz.org: patch splitting, changelog]
Reference: ploop@799559
ploop.spec: use 'conflicts' not 'requires' for vzkernelCommit e644ed7 added requirement for vzkernel not less than a specific
version. In fact, it should be not a requirement but a conflict, since
ploop have a problem working with older kernels.
Fix accordingly.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Replace ploop_{alloc,read}_diskdescriptor() with ploop_read_disk_descr()Commit c0608b3 introduced read_dd() function to be used by tools,
which simplifies code using it a lot (see also commit 631f468).
This commit does the same for the whole library, changing the external
APT as well.
In fact, outside of the library, there is no use of separate calls to
allocate and read a disk descriptor. Even in the library itself, there
is a single place in ploop_create_image()...
ploop_get_info(): make it internalThis is a followup to commit 4985d91. From now on,
ploop_get_info_by_descr() is to be used.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
add_delta(): prevent multiple mountsCommit e644ed7 switched code to cookie-based registration, and if ploop
cookie feature is supported by the kernel, [un]register_ploop_dev() are
not doing anything. As a side effect, ploop_find_dev() check in
register_ploop_dev() is not performed, and it is now possible to mount
same image a few times (given that mount is read-only and NOT via dd.xml):
# ploop mount -m mnt -r root.hdd
Adding ...
Add 'ploop list' commandScan /sys/block/ploop* and list all configured ploop devices in the
following format:
device base_delta cookie
Ignore all errors, added for debug purpoes
[kir@openvz.org: patch merging, rm ploop_err(), export read_line()]
Reference: ploop@795206, ploop@795341, ploop@795364.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
add_delta(): introduce ret and goto outSlight refactoring to simplify the next patch
Reference: ploop@797707
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
lib/delta_sysfs.c: error message fixes1. Do not print function name
2. Print full file name
3. Unify (start with "Can't")
Reference: ploop@797607
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
ploop_find_top_delta_name_and_format(): do not print errorsErrors are printed by the called functions, no need to print two errors.
While at it, make minor formatting changes to the code.
Reference: ploop@797606
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
find_delta_names(): only open/read format file if neededPrevious code was opening/reading format file even if it was not
required. Move the check for format argument != NULL earlier to
the code so we do not open/read format file if not needed.
Reference: ploop@797604
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
delta_sysfs.c: use read_line() where possibleIt greatly simplifies and shortens the code.
Reference: ploop@797602
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Cookie-based ploop image registrationGenerally, we don't want to allow multiple mounts of the same image.
Mounting the same image read/write is forbidden by the kernel, but
mounting it read-only is fine from the kernel point of view. Still,
We need to take care about it in userspace, because otherwise we'll
have a conflict during unmount -- if an image is mounted two times
and we ask to unmount it, it's not clear which device (an...
ploop_mount_image(): fix a messageMessage "Image %s already used by device %s" is way better
than "Image %s already mounted to %s", just because we don't
want to mix between device and mount point. Besides, the same
message is used in register_ploop_dev().
Reference: ploop@797655
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
ploop_mount(): check that mntpnt is dirNoticed while reading through source code that we only check
param->target for existence, not that it's a directory. So,
without this patch, the following happens:
# touch mnt3
# ploop mount -r root.hdd -m mnt3
Adding delta dev=/dev/ploop0 img=root.hdd (ro)
Error in ploop_mount_fs (ploop.c:967): Can't mount file system dev=/dev/ploop0p1 target=mnt3: Not a directory
And then there's no rol...
get_dev_num(), get_dev_start(): fix file name in an error messageWhen printing "Unexpected format of" error message, print full file name.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
ploop_find_dev_by_delta(): treat failed read_line() as errorIf reading image file name from /sys/block/$DEVICE/pdelta/0/image fails,
treat it as error -- so tell about it it and return an error.
Reference: ploop@793010
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
ploop_find_dev_by_delta(): check for error from stat()If stat /sys/block/$DEVICE/pdelta/0/image fails, check errno
and if it's not ENOENT then we have a problem -- so tell about
it it and return an error.
Reference: ploop@793010
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
ploop_find_dev_by_delta(): compare image file nameUse realpath() to get the real delta file name, and then compare it to
/sys/block/$DEVICE/pdelta/0/image rather than doing stat() on both.
Reference: ploop@793010
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Kir Kolyshkin
