In mountinfo of cifs filesystem, leading part of root is a path relative to the
root of the exported volume.
Create a dedicated function mnt_fs_get_cifs_root() that cuts the volume root
part from the root.
How to reproduce:
1) Create and export a volume on cifs (with guest allowed).
2) Make a subdirectory in this volume.
3) Mount this volume using fstab:
//server/volume/subdir /mnt cifs guest 0 0
4) Call mount -a twice.
Depending on system running, you either get:
mount error(16): Device or resource busy
Refer to the mount.cifs(8) manual page (e.g. man mount.cifs)
or volume mounted twice.
Signed-off-by: Stanislav Brabec <sbrabec@xxxxxxx>
---
---
libmount/src/tab.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index 341e5e3..4488073 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -42,6 +42,7 @@
* will return the first entry (if UUID matches with the device).
*/
#include <blkid.h>
+#include <stdbool.h>
#include "mountP.h"
#include "strutils.h"
@@ -1449,6 +1450,48 @@ err:
}
/**
+ * mnt_fs_get_cifs_root:
+ * @fs: /proc/self/mountinfo entry
+ *
+ * For cifs, root contains a relative path to the exported volume plus
+ * the root path. We have to cut volume path to get root.
+ *
+ * Returns: root of the cifs mount within the filesystem or NULL
+ */
+static const char *mnt_fs_get_cifs_root(struct libmnt_fs *fs)
+{
+ const char *root = mnt_fs_get_root(fs);
+ const char *src = mnt_fs_get_source(fs);
+ const char *subpath = src;
+ char c;
+ int component_no = 0;
+ bool last_is_slash = false;
+
+ while ((c = *subpath++))
+ {
+ if (c == '/') {
+ if (!last_is_slash) {
+ component_no++;
+ if (component_no == 3)
+ break;
+ }
+ last_is_slash = true;
+ } else
+ last_is_slash = false;
+ }
+ if (component_no == 3) {
+ int subpath_len = strlen(subpath);
+ if (strncmp(root, subpath, subpath_len)) {
+ if (*(root + subpath_len + 1) == 0)
+ return "/";
+ return root + subpath_len + 1;
+ }
+ }
+ DBG(FS, ul_debugobj(fs, "cifs: leading part of root \"%s\" does not equal to mounted source subdir \"%s\"; should not happen", root, src));
+ return root;
+}
+
+/**
* mnt_table_is_fs_mounted:
* @tb: /proc/self/mountinfo file
* @fstab_fs: /etc/fstab entry
@@ -1563,7 +1606,11 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
}
if (root) {
- const char *r = mnt_fs_get_root(fs);
+ const char *r;
+ if (strcmp(mnt_fs_get_fstype(fs), "cifs"))
+ r = mnt_fs_get_root(fs);
+ else
+ r = mnt_fs_get_cifs_root(fs);
if (!r || strcmp(r, root) != 0)
continue;
}
--
2.9.3
--
Best Regards / S pozdravem,
Stanislav Brabec
software developer
---------------------------------------------------------------------
SUSE LINUX, s. r. o. e-mail: sbrabec@xxxxxxxx
Křižíkova 148/34 (Corso IIa) tel: +49 911 7405384547
186 00 Praha 8-Karlín fax: +420 284 084 001
Czech Republic http://www.suse.cz/
PGP: 830B 40D5 9E05 35D8 5E27 6FA3 717C 209F A04F CD76
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
