Attachment 1470749 Details for Bug 1560555 – Patch for 4.1.2

Patch for 4.1.2

01-spelling-error.diff (text/plain), 4.12 KB, created by Patrick Matthäi on 2018-07-26 12:12:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Matthäi

Created: 2018-07-26 12:12:42 UTC

Size: 4.12 KB

patch

obsolete

># Fix a spelling error.
>
>diff -Naur glusterfs-4.1.2.orig/cli/src/cli.c glusterfs-4.1.2/cli/src/cli.c
>--- glusterfs-4.1.2.orig/cli/src/cli.c	2018-07-24 15:03:16.422141483 +0200
>+++ glusterfs-4.1.2/cli/src/cli.c	2018-07-26 11:51:20.771980106 +0200
>@@ -416,7 +416,7 @@
>                         }
>                 }
>                 else {
>-                        cli_err ("invalide secure-mgmt value (ignored)");
>+                        cli_err ("invalid secure-mgmt value (ignored)");
>                 }
>                 return 0;
>         }
>diff -Naur glusterfs-4.1.2.orig/xlators/features/changelog/src/changelog-helpers.c glusterfs-4.1.2/xlators/features/changelog/src/changelog-helpers.c
>--- glusterfs-4.1.2.orig/xlators/features/changelog/src/changelog-helpers.c	2018-07-24 15:03:16.715142104 +0200
>+++ glusterfs-4.1.2/xlators/features/changelog/src/changelog-helpers.c	2018-07-26 11:51:20.771980106 +0200
>@@ -1239,7 +1239,7 @@
>                          NULL);
>         while (priv->dm.black_fop_cnt > 0) {
>                 gf_msg_debug (this->name, 0,
>-                              "Condtional wait on black fops: %ld",
>+                              "Conditional wait on black fops: %ld",
>                               priv->dm.black_fop_cnt);
>                 priv->dm.drain_wait_black = _gf_true;
>                 ret = pthread_cond_wait (&priv->dm.drain_black_cond,
>@@ -1283,7 +1283,7 @@
>                          NULL);
>         while (priv->dm.white_fop_cnt > 0) {
>                 gf_msg_debug (this->name, 0,
>-                              "Condtional wait on white fops : %ld",
>+                              "Conditional wait on white fops : %ld",
>                         priv->dm.white_fop_cnt);
>                 priv->dm.drain_wait_white = _gf_true;
>                 ret = pthread_cond_wait (&priv->dm.drain_white_cond,
>diff -Naur glusterfs-4.1.2.orig/xlators/features/snapview-server/src/snapview-server.c glusterfs-4.1.2/xlators/features/snapview-server/src/snapview-server.c
>--- glusterfs-4.1.2.orig/xlators/features/snapview-server/src/snapview-server.c	2018-07-24 15:03:16.751142180 +0200
>+++ glusterfs-4.1.2/xlators/features/snapview-server/src/snapview-server.c	2018-07-26 11:51:16.491994785 +0200
>@@ -1185,7 +1185,7 @@
> 
>         ret = inode_ctx_del (inode, this, &value);
>         if (ret) {
>-                gf_log (this->name, GF_LOG_ERROR, "failed to delte the inode "
>+                gf_log (this->name, GF_LOG_ERROR, "failed to delete the inode "
>                         "context of %s", uuid_utoa (inode->gfid));
>                 goto out;
>         }
>diff -Naur glusterfs-4.1.2.orig/xlators/mgmt/glusterd/src/glusterd-volume-set.c glusterfs-4.1.2/xlators/mgmt/glusterd/src/glusterd-volume-set.c
>--- glusterfs-4.1.2.orig/xlators/mgmt/glusterd/src/glusterd-volume-set.c	2018-07-24 15:03:16.802142288 +0200
>+++ glusterfs-4.1.2/xlators/mgmt/glusterd/src/glusterd-volume-set.c	2018-07-26 11:51:20.771980106 +0200
>@@ -1957,7 +1957,7 @@
>           .option     = "xattr-cache-list",
>           .op_version = GD_OP_VERSION_4_0_0,
>           .flags      = VOLOPT_FLAG_CLIENT_OPT,
>-          .description = "A comma separeted list of xattrs that shall be "
>+          .description = "A comma separated list of xattrs that shall be "
>                          "cached by md-cache. The only wildcard allowed is '*'"
>         },
>         { .key        = "performance.nl-cache-pass-through",
>diff -Naur glusterfs-4.1.2.orig/xlators/performance/md-cache/src/md-cache.c glusterfs-4.1.2/xlators/performance/md-cache/src/md-cache.c
>--- glusterfs-4.1.2.orig/xlators/performance/md-cache/src/md-cache.c	2018-07-24 15:03:16.826142339 +0200
>+++ glusterfs-4.1.2/xlators/performance/md-cache/src/md-cache.c	2018-07-26 13:57:47.717859461 +0200
>@@ -3645,7 +3645,7 @@
>           .default_value = "",
>           .op_version = {GD_OP_VERSION_4_0_0},
>           .flags = OPT_FLAG_SETTABLE | OPT_FLAG_CLIENT_OPT | OPT_FLAG_DOC,
>-          .description = "A comma separeted list of xattrs that shall be "
>+          .description = "A comma separated list of xattrs that shall be "
>                          "cached by md-cache. The only wildcard allowed is '*'",
>         },
>         { .key  = {"pass-through"},

Actions: View

Attachments on bug 1560555: 1413098 | 1413099 | 1470749