Attachment 830622 Details for Bug 1036089 – This patch fixes the issue

[patch] This patch fixes the issue

ceph-0.67.3-netdev3.patch (text/plain), 1.52 KB, created by Rolf Fokkens on 2013-11-29 12:11:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rolf Fokkens

Created: 2013-11-29 12:11:39 UTC

Size: 1.52 KB

patch

obsolete

>--- ceph-0.67.3/src/mount/mount.ceph.c.netdev	2013-09-09 20:52:41.000000000 +0200
>+++ ceph-0.67.3/src/mount/mount.ceph.c	2013-11-26 16:49:13.750007972 +0100
>@@ -147,7 +147,7 @@
> 		} else if (strncmp(data, "noauto", 6) == 0) {
> 			skip = 1;  /* ignore */
> 		} else if (strncmp(data, "_netdev", 7) == 0) {
>-			skip = 1;  /* ignore */
>+			skip = 0;
> 
> 		} else if (strncmp(data, "secretfile", 10) == 0) {
> 			if (!value || !*value) {
>@@ -241,6 +241,31 @@
> 	return out;
> }
> 
>+static char *strip_netdev (const char *opts)
>+{
>+        int len;
>+        char *out, *p1, *p2;
>+
>+        len = strlen (opts);
>+
>+        out = malloc (len + 2);
>+        strcpy (out, opts);
>+        out[len]   = ',';
>+        out[len+1] = '\0';
>+
>+        p1 = strstr (out, "_netdev,");
>+
>+        if (p1 != NULL) {
>+                p2 = p1 + 8;
>+                while (*p2) *p1++ = *p2++;
>+                *p1 = '\0';
>+                len -= 8;
>+        }
>+
>+        out[len] = '\0';
>+
>+        return out;
>+}
> 
> static int parse_arguments(int argc, char *const *const argv,
> 		const char **src, const char **node, const char **opts)
>@@ -327,6 +352,7 @@
> 	const char *src, *node, *opts;
> 	char *rsrc = NULL;
> 	char *popts = NULL;
>+	char *mopts;
> 	int flags = 0;
> 	int retval = 0;
> 
>@@ -349,10 +375,11 @@
> 		printf("failed to parse ceph_options\n");
> 		exit(1);
> 	}
>+	mopts = strip_netdev (popts);
> 
> 	block_signals(SIG_BLOCK);
> 
>-	if (mount(rsrc, node, "ceph", flags, popts)) {
>+	if (mount(rsrc, node, "ceph", flags, mopts)) {
> 		retval = errno;
> 		switch (errno) {
> 		case ENODEV:

Actions: View | Diff

Attachments on bug 1036089: 830622