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

virfile: added GPFS as shared fs

Browse Source 
Added GPFS as shared file system recognized during live migration
security checks.

GPFS is 'IBM General Parallel File System' also called
'IBM Spectrum Scale'

BUG: https://bugzilla.redhat.com/show_bug.cgi?id=1679528

Signed-off-by: Diego Michelotto <diego.michelotto@cnaf.infn.it>
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Diego Michelotto 2019-02-25 19:19:03 +01:00 committed by Peter Krempa
parent ac62e297db
commit d163b940a7
5 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/virfile.c
View File

@ -3478,6 +3478,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
# ifndef CEPH_SUPER_MAGIC # ifndef CEPH_SUPER_MAGIC
# define CEPH_SUPER_MAGIC 0x00C36400 # define CEPH_SUPER_MAGIC 0x00C36400
# endif # endif
# ifndef GPFS_SUPER_MAGIC
# define GPFS_SUPER_MAGIC 0x47504653
# endif
# define PROC_MOUNTS "/proc/mounts" # define PROC_MOUNTS "/proc/mounts"
@ -3623,6 +3626,9 @@ virFileIsSharedFSType(const char *path,
if ((fstypes & VIR_FILE_SHFS_CEPH) && if ((fstypes & VIR_FILE_SHFS_CEPH) &&
(f_type == CEPH_SUPER_MAGIC)) (f_type == CEPH_SUPER_MAGIC))
return 1; return 1;
if ((fstypes & VIR_FILE_SHFS_GPFS) &&
(f_type == GPFS_SUPER_MAGIC))
return 1;
return 0; return 0;
} }
@ -3786,7 +3792,8 @@ int virFileIsSharedFS(const char *path)
VIR_FILE_SHFS_AFS | VIR_FILE_SHFS_AFS |
VIR_FILE_SHFS_SMB | VIR_FILE_SHFS_SMB |
VIR_FILE_SHFS_CIFS | VIR_FILE_SHFS_CIFS |
VIR_FILE_SHFS_CEPH); VIR_FILE_SHFS_CEPH |
VIR_FILE_SHFS_GPFS);
} }

1
src/util/virfile.h
View File

@ -221,6 +221,7 @@ enum {
VIR_FILE_SHFS_SMB = (1 << 4), VIR_FILE_SHFS_SMB = (1 << 4),
VIR_FILE_SHFS_CIFS = (1 << 5), VIR_FILE_SHFS_CIFS = (1 << 5),
VIR_FILE_SHFS_CEPH = (1 << 6), VIR_FILE_SHFS_CEPH = (1 << 6),
VIR_FILE_SHFS_GPFS = (1 << 7),
}; };
int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1); int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1);

1
tests/virfiledata/mounts3.txt
View File

@ -35,3 +35,4 @@ host:/gv0 /gluster fuse.glusterfs rw 0 0
root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0 root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0
192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
gpfs_data /gpfs/data gpfs rw,relatime 0 0

5
tests/virfilemock.c
View File

@ -89,6 +89,9 @@ setmntent(const char *filename, const char *type)
#ifndef CEPH_SUPER_MAGIC #ifndef CEPH_SUPER_MAGIC
# define CEPH_SUPER_MAGIC 0x00c36400 # define CEPH_SUPER_MAGIC 0x00c36400
#endif #endif
#ifndef GPFS_SUPER_MAGIC
# define GPFS_SUPER_MAGIC 0x47504653
#endif
static int static int
@ -137,6 +140,8 @@ statfs_mock(const char *mtab,
ftype = FUSE_SUPER_MAGIC; ftype = FUSE_SUPER_MAGIC;
} else if (STRPREFIX(mb.mnt_type, "ceph")) { } else if (STRPREFIX(mb.mnt_type, "ceph")) {
ftype = CEPH_SUPER_MAGIC; ftype = CEPH_SUPER_MAGIC;
} else if (STRPREFIX(mb.mnt_type, "gpfs")) {
ftype = GPFS_SUPER_MAGIC;
} else { } else {
/* Everything else is EXT4. We don't care really for other paths. */ /* Everything else is EXT4. We don't care really for other paths. */
ftype = EXT4_SUPER_MAGIC; ftype = EXT4_SUPER_MAGIC;

1
tests/virfiletest.c
View File

@ -457,6 +457,7 @@ mymain(void)
DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true);
DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true);
DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/multi/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/multi/file", true);
DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gpfs/data", true);
return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS; return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
} }