External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

virfile: fix cast-align error

Browse Source 
On s390x the struct member f_type of statsfs is hard coded to 'unsigned
int'. Change virFileIsSharedFixFUSE() to take a 'long long int' and use
a temporary to avoid pointer-casting.

This fixes the following error:
../../src/util/virfile.c:3578:38: error: cast increases required alignment of target type [-Werror=cast-align]
         virFileIsSharedFixFUSE(path, (long *) &sb.f_type);

Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
This commit is contained in:
Marc Hartmayer 2018-10-10 10:04:04 +02:00 committed by Michal Privoznik
parent 7bff646d71
commit 2b03534eeb
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/util/virfile.c
View File

@ -3466,7 +3466,7 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
static int
virFileIsSharedFixFUSE(const char *path,
long *f_type)
long long *f_type)
{
char *dirpath = NULL;
const char **mounts = NULL;
@ -3537,6 +3537,7 @@ virFileIsSharedFSType(const char *path,
char *p;
struct statfs sb;
int statfs_ret;
long long f_type = 0;
if (VIR_STRDUP(dirpath, path) < 0)
return -1;
@ -3573,32 +3574,34 @@ virFileIsSharedFSType(const char *path,
return -1;
}
if (sb.f_type == FUSE_SUPER_MAGIC) {
f_type = sb.f_type;
if (f_type == FUSE_SUPER_MAGIC) {
VIR_DEBUG("Found FUSE mount for path=%s. Trying to fix it", path);
virFileIsSharedFixFUSE(path, (long *) &sb.f_type);
virFileIsSharedFixFUSE(path, &f_type);
}
VIR_DEBUG("Check if path %s with FS magic %lld is shared",
path, (long long int)sb.f_type);
path, f_type);
if ((fstypes & VIR_FILE_SHFS_NFS) &&
(sb.f_type == NFS_SUPER_MAGIC))
(f_type == NFS_SUPER_MAGIC))
return 1;
if ((fstypes & VIR_FILE_SHFS_GFS2) &&
(sb.f_type == GFS2_MAGIC))
(f_type == GFS2_MAGIC))
return 1;
if ((fstypes & VIR_FILE_SHFS_OCFS) &&
(sb.f_type == OCFS2_SUPER_MAGIC))
(f_type == OCFS2_SUPER_MAGIC))
return 1;
if ((fstypes & VIR_FILE_SHFS_AFS) &&
(sb.f_type == AFS_FS_MAGIC))
(f_type == AFS_FS_MAGIC))
return 1;
if ((fstypes & VIR_FILE_SHFS_SMB) &&
(sb.f_type == SMB_SUPER_MAGIC))
(f_type == SMB_SUPER_MAGIC))
return 1;
if ((fstypes & VIR_FILE_SHFS_CIFS) &&
(sb.f_type == CIFS_SUPER_MAGIC))
(f_type == CIFS_SUPER_MAGIC))
return 1;
return 0;