diff options
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 2 | ||||
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 2 | ||||
| -rw-r--r-- | cli/src/cli-xml-output.c | 2 | ||||
| -rw-r--r-- | doc/glusterfsd.8 | 2 | ||||
| -rw-r--r-- | doc/mount.glusterfs.8 | 6 | ||||
| -rwxr-xr-x | extras/ganesha/scripts/create-export-ganesha.sh | 2 | ||||
| -rwxr-xr-x | extras/ganesha/scripts/dbus-send.sh | 2 | ||||
| -rwxr-xr-x | extras/hook-scripts/reset/post/S31ganesha-reset.sh | 3 | ||||
| -rw-r--r-- | geo-replication/src/peer_mountbroker.in | 4 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 4 | ||||
| -rw-r--r-- | libglusterfs/src/fd-lk.c | 2 | ||||
| -rw-r--r-- | libglusterfs/src/gfdb/gfdb_sqlite3.c | 10 | ||||
| -rw-r--r-- | libglusterfs/src/gfdb/gfdb_sqlite3_helper.c | 18 | ||||
| -rw-r--r-- | xlators/cluster/ec/src/ec-common.c | 2 | ||||
| -rw-r--r-- | xlators/features/changetimerecorder/src/changetimerecorder.c | 2 | ||||
| -rw-r--r-- | xlators/features/changetimerecorder/src/ctr-xlator-ctx.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-quota.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rebalance.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rpc-ops.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 2 | 
20 files changed, 38 insertions, 37 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 59c27b87f48..6b2d6dfe7da 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -2448,7 +2448,7 @@ parse_ssh_port (const char **words, int wordcount, dict_t *dict,                  if (errno == ERANGE || errno == EINVAL || limit <= 0                                      || strcmp (end_ptr, "") != 0) {                          ret = -1; -                        cli_err ("Please enter an interger value for ssh_port "); +                        cli_err ("Please enter an integer value for ssh_port ");                          goto out;                  } diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 88c01ee790e..3892aabaab8 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -4591,7 +4591,7 @@ gf_cli_attach_tier (call_frame_t *frame, xlator_t *this,  notify_cli:          if (ret) {                  cli_out ("Failed to run tier start. Please execute tier start " -                         "command explictly"); +                         "command explicitly");                  cli_out ("Usage : gluster volume rebalance <volname> tier "                           "start");          } diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index 439c3047e31..3d6545c6fed 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -5618,7 +5618,7 @@ cli_xml_snapshot_config (xmlTextWriterPtr writer, xmlDocPtr doc, dict_t *dict)                  }                  break;          default: -                gf_log ("cli", GF_LOG_ERROR, "Uknown config command :%d", +                gf_log ("cli", GF_LOG_ERROR, "Unknown config command :%d",                          config_command);                  ret = -1;                  goto out; diff --git a/doc/glusterfsd.8 b/doc/glusterfsd.8 index 88b667cb463..956cb24bca3 100644 --- a/doc/glusterfsd.8 +++ b/doc/glusterfsd.8 @@ -103,7 +103,7 @@ Set entry timeout to SECONDS in fuse kernel module [default: 1]  Enable/Disable direct-io mode in fuse module [default: enable]  .TP  \fB\-\-resolve-gids\fR -Resolve all auxilary groups in fuse translator (max 32 otherwise) +Resolve all auxiliary groups in fuse translator (max 32 otherwise)  .SS "Miscellaneous Options"  .PP diff --git a/doc/mount.glusterfs.8 b/doc/mount.glusterfs.8 index 4cb7772971d..4e82c2fd57d 100644 --- a/doc/mount.glusterfs.8 +++ b/doc/mount.glusterfs.8 @@ -80,7 +80,7 @@ Set entry timeout to SECONDS in fuse kernel module [default: 1]  Set fuse module's background queue length to N [default: 64]  .TP  \fBgid\-timeout=\fRSECONDS -Set auxilary group list timeout to SECONDS for fuse translator [default: 0] +Set auxiliary group list timeout to SECONDS for fuse translator [default: 0]  .TP  \fBnegative\-timeout=\fRSECONDS  Set negative timeout to SECONDS in fuse kernel module [default: 0] @@ -99,7 +99,7 @@ Set fuse module's congestion threshold to N [default: 48]  \fBbackup\-volfile\-servers=\fRSERVERLIST  Provide list of backup volfile servers in the following format [default: None] -\fB$ mount -t glusterfs -obackup-volfile-servers=<server2>:\fR +\fB$ mount \-t glusterfs \-obackup\-volfile\-servers=<server2>:\fR  \fB       <server3>:...:<serverN> <server1>:/<volname> <mount_point>\fR  .TP @@ -107,7 +107,7 @@ Provide list of backup volfile servers in the following format [default: None]  \fBbackupvolfile\-server=\fRSERVER  Provide list of backup volfile servers in the following format [default: None] -\fB $ mount -t glusterfs -obackupvolfile-server=<server2> +\fB $ mount \-t glusterfs \-obackupvolfile\-server=<server2>  \fB         <server1>:/<volname> <mount_point>  .TP diff --git a/extras/ganesha/scripts/create-export-ganesha.sh b/extras/ganesha/scripts/create-export-ganesha.sh index c1e02d6997d..a1a35dba58a 100755 --- a/extras/ganesha/scripts/create-export-ganesha.sh +++ b/extras/ganesha/scripts/create-export-ganesha.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash  #This script is called by glusterd when the user  #tries to export a volume via NFS-Ganesha. diff --git a/extras/ganesha/scripts/dbus-send.sh b/extras/ganesha/scripts/dbus-send.sh index 9f638ca4d6b..14af095464d 100755 --- a/extras/ganesha/scripts/dbus-send.sh +++ b/extras/ganesha/scripts/dbus-send.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash  # Try loading the config from any of the distro  # specific configuration locations diff --git a/extras/hook-scripts/reset/post/S31ganesha-reset.sh b/extras/hook-scripts/reset/post/S31ganesha-reset.sh index 8191d960592..9538911a842 100755 --- a/extras/hook-scripts/reset/post/S31ganesha-reset.sh +++ b/extras/hook-scripts/reset/post/S31ganesha-reset.sh @@ -1,4 +1,5 @@ -#/bin/bash +#!/bin/bash +  PROGNAME="Sganesha-reset"  OPTSPEC="volname:,gd-workdir:"  VOL= diff --git a/geo-replication/src/peer_mountbroker.in b/geo-replication/src/peer_mountbroker.in index 8573abdf122..ec514f038e1 100644 --- a/geo-replication/src/peer_mountbroker.in +++ b/geo-replication/src/peer_mountbroker.in @@ -159,11 +159,11 @@ def _get_args():      parser_useradd.add_argument('username', help="Username", type=str)      parser_useradd.add_argument('volumes', type=str, default='', -                                help="Volumes list. ',' seperated") +                                help="Volumes list. ',' separated")      parser_volumedel.add_argument('username', help="Username", type=str)      parser_volumedel.add_argument('volumes', type=str, default='', -                                help="Volumes list. ',' seperated") +                                help="Volumes list. ',' separated")      parser_userdel.add_argument('username', help="Username", type=str) diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 81bc15b8b28..3324d0b2aeb 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -198,10 +198,10 @@ static struct argp_option gf_options[] = {           "Set attribute timeout to SECONDS for inodes in fuse kernel module "           "[default: 1]"},  	{"gid-timeout", ARGP_GID_TIMEOUT_KEY, "SECONDS", 0, -	 "Set auxilary group list timeout to SECONDS for fuse translator " +	 "Set auxiliary group list timeout to SECONDS for fuse translator "  	 "[default: 300]"},          {"resolve-gids", ARGP_RESOLVE_GIDS_KEY, 0, 0, -         "Resolve all auxilary groups in fuse translator (max 32 otherwise)"}, +         "Resolve all auxiliary groups in fuse translator (max 32 otherwise)"},  	{"background-qlen", ARGP_FUSE_BACKGROUND_QLEN_KEY, "N", 0,  	 "Set fuse module's background queue length to N "  	 "[default: 64]"}, diff --git a/libglusterfs/src/fd-lk.c b/libglusterfs/src/fd-lk.c index 01c6c1a0157..358cf3b616a 100644 --- a/libglusterfs/src/fd-lk.c +++ b/libglusterfs/src/fd-lk.c @@ -446,7 +446,7 @@ fd_lk_insert_and_merge (fd_t *fd, int32_t cmd,          lk_ctx = fd_lk_ctx_ref (fd->lk_ctx);          lk     = fd_lk_ctx_node_new (cmd, flock); -        gf_msg_debug ("fd-lk", 0, "new lock requrest: owner = %s, fl_type = %s" +        gf_msg_debug ("fd-lk", 0, "new lock request: owner = %s, fl_type = %s"                        ", fs_start = %"PRId64", fs_end = %"PRId64", user_flock:"                        " l_type = %s, l_start = %"PRId64", l_len = %"PRId64,                        lkowner_utoa (&flock->l_owner), diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c index 1d10afdaef7..04781be562a 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c @@ -650,7 +650,7 @@ gf_sqlite3_find_all (void *db_conn, gf_query_callback_t query_callback,                                  &prep_stmt, 0);          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, -                        LG_MSG_PREPARE_FAILED, "Failed to prepare statment %s :" +                        LG_MSG_PREPARE_FAILED, "Failed to prepare statement %s :"                          "%s", query_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1; @@ -726,7 +726,7 @@ gf_sqlite3_find_recently_changed_files(void *db_conn,                                 &prep_stmt, 0);          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, -                        LG_MSG_PREPARE_FAILED, "Failed to prepare statment %s :" +                        LG_MSG_PREPARE_FAILED, "Failed to prepare statement %s :"                          " %s", query_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1; @@ -826,7 +826,7 @@ gf_sqlite3_find_unchanged_for_time (void *db_conn,                                 &prep_stmt, 0);          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, -                        LG_MSG_PREPARE_FAILED, "Failed to prepare statment %s :" +                        LG_MSG_PREPARE_FAILED, "Failed to prepare statement %s :"                          " %s", query_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1; @@ -938,7 +938,7 @@ gf_sqlite3_find_recently_changed_files_freq (void *db_conn,                                  &prep_stmt, 0);          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, -                        LG_MSG_PREPARE_FAILED, "Failed to prepare statment %s :" +                        LG_MSG_PREPARE_FAILED, "Failed to prepare statement %s :"                          " %s", query_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1; @@ -1099,7 +1099,7 @@ gf_sqlite3_find_unchanged_for_time_freq (void *db_conn,          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,                          LG_MSG_PREPARE_FAILED, "Failed to prepare delete " -                        "statment %s : %s", query_str, +                        "statement %s : %s", query_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1;                  goto out; diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c index 906fdd261f7..8e1e27ff082 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c @@ -48,7 +48,7 @@ gf_sql_delete_all (gf_sql_connection_t  *sql_conn,          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,                          LG_MSG_PREPARE_FAILED, "Failed preparing delete " -                        "statment %s : %s", delete_link_str, +                        "statement %s : %s", delete_link_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1;                  goto out; @@ -88,7 +88,7 @@ gf_sql_delete_all (gf_sql_connection_t  *sql_conn,          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,                          LG_MSG_PREPARE_FAILED, "Failed preparing delete " -                        "statment %s : %s", delete_file_str, +                        "statement %s : %s", delete_file_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1;                  goto out; @@ -148,7 +148,7 @@ gf_sql_delete_link (gf_sql_connection_t  *sql_conn,          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,                          LG_MSG_PREPARE_FAILED, "Failed preparing delete " -                        "statment %s : %s", delete_str, +                        "statement %s : %s", delete_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1;                  goto out; @@ -243,7 +243,7 @@ gf_sql_update_link_flags (gf_sql_connection_t  *sql_conn,          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,                          LG_MSG_PREPARE_FAILED, "Failed preparing update " -                        "statment %s : %s", update_str, +                        "statement %s : %s", update_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1;                  goto out; @@ -345,7 +345,7 @@ gf_sql_insert_link (gf_sql_connection_t  *sql_conn,                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,                          LG_MSG_PREPARE_FAILED,                          "Failed preparing insert " -                        "statment %s : %s", insert_str, +                        "statement %s : %s", insert_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1;                  goto out; @@ -459,7 +459,7 @@ gf_sql_update_link (gf_sql_connection_t  *sql_conn,          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,                          LG_MSG_PREPARE_FAILED, "Failed preparing insert " -                        "statment %s : %s", insert_str, +                        "statement %s : %s", insert_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1;                  goto out; @@ -542,7 +542,7 @@ gf_sql_insert_write_wind_time (gf_sql_connection_t      *sql_conn,          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,                          LG_MSG_PREPARE_FAILED, "Failed preparing insert " -                        "statment %s : %s", insert_str, +                        "statement %s : %s", insert_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1;                  goto out; @@ -621,7 +621,7 @@ gf_update_time (gf_sql_connection_t    *sql_conn,          GF_VALIDATE_OR_GOTO (GFDB_STR_SQLITE3, update_time, out);          /* -         * Constructing the prepare statment string. +         * Constructing the prepare statement string.           *           * */          /*For write time*/ @@ -671,7 +671,7 @@ gf_update_time (gf_sql_connection_t    *sql_conn,          if (ret != SQLITE_OK) {                  gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,                          LG_MSG_PREPARE_FAILED, "Failed preparing insert " -                        "statment %s : %s", update_str, +                        "statement %s : %s", update_str,                          sqlite3_errmsg (sql_conn->sqlite3_db_conn));                  ret = -1;                  goto out; diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index 744670bcb6c..009fad2f896 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -456,7 +456,7 @@ int32_t ec_child_select(ec_fop_data_t * fop)      {          gf_msg (ec->xl->name, GF_LOG_ERROR, 0,                  EC_MSG_CHILDS_INSUFFICIENT, -                "Insufficient available childs " +                "Insufficient available children "                  "for this request (have %d, need "                  "%d)", num, fop->minimum); diff --git a/xlators/features/changetimerecorder/src/changetimerecorder.c b/xlators/features/changetimerecorder/src/changetimerecorder.c index d339189edb8..95ce08fea2b 100644 --- a/xlators/features/changetimerecorder/src/changetimerecorder.c +++ b/xlators/features/changetimerecorder/src/changetimerecorder.c @@ -2056,7 +2056,7 @@ init (xlator_t *this)          if (!priv) {                  gf_msg (this->name, GF_LOG_ERROR, ENOMEM,                          CTR_MSG_CALLOC_FAILED, -                        "Calloc didnt work!!!"); +                        "Calloc did not work!!!");                  goto error;          } diff --git a/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c index c5900eac929..7700ad40ba6 100644 --- a/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c +++ b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c @@ -156,7 +156,7 @@ ctr_delete_hard_link (xlator_t                *this,          if (!ctr_hard_link) {                  gf_msg (this->name, GF_LOG_ERROR, 0,                          CTR_MSG_HARDLINK_MISSING_IN_LIST, -                        "Hard link doesnt exist in the list"); +                        "Hard link doesn't exist in the list");                  goto out;          } @@ -195,7 +195,7 @@ ctr_update_hard_link (xlator_t                *this,          ctr_hard_link = ctr_search_hard_link_ctx (this, ctr_xlator_ctx,                                                  old_pgfid, old_base_name);          if (!ctr_hard_link) { -                gf_msg_trace (this->name, 0, "Hard link doesnt exist" +                gf_msg_trace (this->name, 0, "Hard link doesn't exist"                                " in the list");                  /* Since the hard link is not present in the list                   * we add it to the list */ diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index 4390eaab3e6..55699cc57a9 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c @@ -2047,7 +2047,7 @@ glusterd_op_stage_quota (dict_t *dict, char **op_errstr, dict_t *rsp_dict)                  if (ret) {                          gf_msg (this->name, GF_LOG_ERROR, 0,                                  GD_MSG_DICT_GET_FAILED, -                                "Faild to get hard-limit from dict"); +                                "Failed to get hard-limit from dict");                          goto out;                  }                  ret = gf_string2bytesize_int64 (hard_limit_str, &hard_limit); diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index fff6b3c2d91..773e59b769a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -1104,7 +1104,7 @@ glusterd_defrag_event_notify_handle (dict_t *dict)          } else {                  gf_msg (this->name, GF_LOG_ERROR, 0,                          GD_MSG_NO_REBALANCE_PFX_IN_VOLNAME, -                        "volname recieved (%s) is not prefixed with rebalance.", +                        "volname received (%s) is not prefixed with rebalance.",                          volname);                  ret = -1;                  goto out; diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c index 3068ba43396..f7e8cfe248c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c @@ -419,7 +419,7 @@ out:          GLUSTERD_STACK_DESTROY (((call_frame_t *)myframe));          /* Attempt to start the state machine. Needed as no state machine could -         * be running at time this RPC reply was recieved +         * be running at time this RPC reply was received           */          if (!ret) {                  glusterd_friend_sm (); diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index e53e99739d2..0600290cbe0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -2745,7 +2745,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {            .description = "Its a Change Time Recorder Xlator option to "                           "enable recording write heat on metadata of the file. "                           "The default is disabled. " -                         "Metadata is inode atttributes like atime, mtime," +                         "Metadata is inode attributes like atime, mtime,"                           " permissions etc and "                           "extended attributes of a file ."          },  | 
