shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 05:17:59 +03:00
Code Releases Activity

Remove pointless 'srcpath' variable in lxcContainerMountBasicFS

Browse Source 
The 'srcpath' variable is initialized from 'mnt->src' and never
changed thereafter. Some places continue to use 'mnt->src' and
others use 'srcpath'. Remove the pointless 'srcpath' variable
and use 'mnt->src' everywhere.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-10-07 12:13:15 +01:00
parent c6b84a9dee
commit f567a583f3
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lxc/lxc_container.c
View File

@ -855,16 +855,13 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) {
virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i];
const char *srcpath = NULL;
VIR_DEBUG("Processing %s -> %s",
mnt->src, mnt->dst);
srcpath = mnt->src;
/* Skip if mount doesn't exist in source */
if ((srcpath[0] == '/') &&
(access(srcpath, R_OK) < 0))
if ((mnt->src[0] == '/') &&
(access(mnt->src, R_OK) < 0))
continue;
#if WITH_SELINUX
@ -884,11 +881,11 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
}
VIR_DEBUG("Mount %s on %s type=%s flags=%x",
srcpath, mnt->dst, mnt->type, mnt->mflags);
if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
mnt->src, mnt->dst, mnt->type, mnt->mflags);
if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
virReportSystemError(errno,
_("Failed to mount %s on %s type %s flags=%x"),
srcpath, mnt->dst, NULLSTR(mnt->type),
mnt->src, mnt->dst, NULLSTR(mnt->type),
mnt->mflags);
goto cleanup;
}