|
 |
99cbc7 |
From 2a740435a960bd08acb0352b70d7e1a85fac7286 Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <2a740435a960bd08acb0352b70d7e1a85fac7286@dist-git>
|
|
|
99cbc7 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
Date: Mon, 4 Feb 2019 10:37:50 +0100
|
|
|
99cbc7 |
Subject: [PATCH] virfile: Detect ceph as shared FS
|
|
|
99cbc7 |
|
|
|
99cbc7 |
RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1665553
|
|
|
99cbc7 |
RHEL-7.6.z: https://bugzilla.redhat.com/show_bug.cgi?id=1672178
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Ceph can be mounted just like any other filesystem and in fact is
|
|
|
99cbc7 |
a shared and cluster filesystem. The filesystem magic constant
|
|
|
99cbc7 |
was taken from kernel sources as it is not in magic.h yet.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 6dd2a2ae6386b1d51edcc9a434f56d7f9dc2cb35)
|
|
|
99cbc7 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
Message-Id: <60cef73c5369ea9b37bf0663ee7f06e2605abd46.1549273057.git.mprivozn@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/util/virfile.c | 9 ++++++++-
|
|
|
99cbc7 |
src/util/virfile.h | 1 +
|
|
|
99cbc7 |
src/util/virstoragefile.c | 3 ++-
|
|
|
99cbc7 |
tests/virfiledata/mounts3.txt | 2 ++
|
|
|
99cbc7 |
tests/virfilemock.c | 5 +++++
|
|
|
99cbc7 |
tests/virfiletest.c | 2 ++
|
|
|
99cbc7 |
6 files changed, 20 insertions(+), 2 deletions(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/util/virfile.c b/src/util/virfile.c
|
|
|
99cbc7 |
index 716b55d770..471d309062 100644
|
|
|
99cbc7 |
--- a/src/util/virfile.c
|
|
|
99cbc7 |
+++ b/src/util/virfile.c
|
|
|
99cbc7 |
@@ -3537,6 +3537,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
|
|
|
99cbc7 |
# ifndef FUSE_SUPER_MAGIC
|
|
|
99cbc7 |
# define FUSE_SUPER_MAGIC 0x65735546
|
|
|
99cbc7 |
# endif
|
|
|
99cbc7 |
+# ifndef CEPH_SUPER_MAGIC
|
|
|
99cbc7 |
+# define CEPH_SUPER_MAGIC 0x00C36400
|
|
|
99cbc7 |
+# endif
|
|
|
99cbc7 |
|
|
|
99cbc7 |
# define PROC_MOUNTS "/proc/mounts"
|
|
|
99cbc7 |
|
|
|
99cbc7 |
@@ -3682,6 +3685,9 @@ virFileIsSharedFSType(const char *path,
|
|
|
99cbc7 |
if ((fstypes & VIR_FILE_SHFS_CIFS) &&
|
|
|
99cbc7 |
(f_type == CIFS_SUPER_MAGIC))
|
|
|
99cbc7 |
return 1;
|
|
|
99cbc7 |
+ if ((fstypes & VIR_FILE_SHFS_CEPH) &&
|
|
|
99cbc7 |
+ (f_type == CEPH_SUPER_MAGIC))
|
|
|
99cbc7 |
+ return 1;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
return 0;
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
@@ -3845,7 +3851,8 @@ int virFileIsSharedFS(const char *path)
|
|
|
99cbc7 |
VIR_FILE_SHFS_OCFS |
|
|
|
99cbc7 |
VIR_FILE_SHFS_AFS |
|
|
|
99cbc7 |
VIR_FILE_SHFS_SMB |
|
|
|
99cbc7 |
- VIR_FILE_SHFS_CIFS);
|
|
|
99cbc7 |
+ VIR_FILE_SHFS_CIFS |
|
|
|
99cbc7 |
+ VIR_FILE_SHFS_CEPH);
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/util/virfile.h b/src/util/virfile.h
|
|
|
99cbc7 |
index 6f1e802fde..1d16e96b59 100644
|
|
|
99cbc7 |
--- a/src/util/virfile.h
|
|
|
99cbc7 |
+++ b/src/util/virfile.h
|
|
|
99cbc7 |
@@ -205,6 +205,7 @@ enum {
|
|
|
99cbc7 |
VIR_FILE_SHFS_AFS = (1 << 3),
|
|
|
99cbc7 |
VIR_FILE_SHFS_SMB = (1 << 4),
|
|
|
99cbc7 |
VIR_FILE_SHFS_CIFS = (1 << 5),
|
|
|
99cbc7 |
+ VIR_FILE_SHFS_CEPH = (1 << 6),
|
|
|
99cbc7 |
};
|
|
|
99cbc7 |
|
|
|
99cbc7 |
int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1);
|
|
|
99cbc7 |
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
|
|
|
99cbc7 |
index 58f67278da..0b15219c3e 100644
|
|
|
99cbc7 |
--- a/src/util/virstoragefile.c
|
|
|
99cbc7 |
+++ b/src/util/virstoragefile.c
|
|
|
99cbc7 |
@@ -1366,7 +1366,8 @@ int virStorageFileIsClusterFS(const char *path)
|
|
|
99cbc7 |
*/
|
|
|
99cbc7 |
return virFileIsSharedFSType(path,
|
|
|
99cbc7 |
VIR_FILE_SHFS_GFS2 |
|
|
|
99cbc7 |
- VIR_FILE_SHFS_OCFS);
|
|
|
99cbc7 |
+ VIR_FILE_SHFS_OCFS |
|
|
|
99cbc7 |
+ VIR_FILE_SHFS_CEPH);
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
|
|
|
99cbc7 |
#ifdef LVS
|
|
|
99cbc7 |
diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt
|
|
|
99cbc7 |
index 134c6e8f81..68eded048c 100644
|
|
|
99cbc7 |
--- a/tests/virfiledata/mounts3.txt
|
|
|
99cbc7 |
+++ b/tests/virfiledata/mounts3.txt
|
|
|
99cbc7 |
@@ -33,3 +33,5 @@ host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255,
|
|
|
99cbc7 |
dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0
|
|
|
99cbc7 |
host:/gv0 /gluster fuse.glusterfs rw 0 0
|
|
|
99cbc7 |
root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0
|
|
|
99cbc7 |
+192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
|
|
|
99cbc7 |
+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
|
|
|
99cbc7 |
diff --git a/tests/virfilemock.c b/tests/virfilemock.c
|
|
|
99cbc7 |
index ae5c8d025a..eb5182df66 100644
|
|
|
99cbc7 |
--- a/tests/virfilemock.c
|
|
|
99cbc7 |
+++ b/tests/virfilemock.c
|
|
|
99cbc7 |
@@ -88,6 +88,9 @@ setmntent(const char *filename, const char *type)
|
|
|
99cbc7 |
#ifndef FUSE_SUPER_MAGIC
|
|
|
99cbc7 |
# define FUSE_SUPER_MAGIC 0x65735546
|
|
|
99cbc7 |
#endif
|
|
|
99cbc7 |
+#ifndef CEPH_SUPER_MAGIC
|
|
|
99cbc7 |
+# define CEPH_SUPER_MAGIC 0x00c36400
|
|
|
99cbc7 |
+#endif
|
|
|
99cbc7 |
|
|
|
99cbc7 |
|
|
|
99cbc7 |
static int
|
|
|
99cbc7 |
@@ -134,6 +137,8 @@ statfs_mock(const char *mtab,
|
|
|
99cbc7 |
ftype = CIFS_SUPER_MAGIC;
|
|
|
99cbc7 |
} else if (STRPREFIX(mb.mnt_type, "fuse")) {
|
|
|
99cbc7 |
ftype = FUSE_SUPER_MAGIC;
|
|
|
99cbc7 |
+ } else if (STRPREFIX(mb.mnt_type, "ceph")) {
|
|
|
99cbc7 |
+ ftype = CEPH_SUPER_MAGIC;
|
|
|
99cbc7 |
} else {
|
|
|
99cbc7 |
/* Everything else is EXT4. We don't care really for other paths. */
|
|
|
99cbc7 |
ftype = EXT4_SUPER_MAGIC;
|
|
|
99cbc7 |
diff --git a/tests/virfiletest.c b/tests/virfiletest.c
|
|
|
99cbc7 |
index a246d601ba..972c07fdc5 100644
|
|
|
99cbc7 |
--- a/tests/virfiletest.c
|
|
|
99cbc7 |
+++ b/tests/virfiletest.c
|
|
|
99cbc7 |
@@ -458,6 +458,8 @@ mymain(void)
|
|
|
99cbc7 |
DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/file", true);
|
|
|
99cbc7 |
DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/sshfs/file", false);
|
|
|
99cbc7 |
DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true);
|
|
|
99cbc7 |
+ DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true);
|
|
|
99cbc7 |
+ DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/multi/file", true);
|
|
|
99cbc7 |
|
|
|
99cbc7 |
return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|