diff options
48 files changed, 87 insertions, 87 deletions
diff --git a/cli/src/cli-rl.c b/cli/src/cli-rl.c index 592da7baa78..9a37a77de5e 100644 --- a/cli/src/cli-rl.c +++ b/cli/src/cli-rl.c @@ -192,7 +192,7 @@ cli_rl_tokenize (const char *text) } if (i < count) { - /* symoblize that what needs to be autocompleted is + /* symbolize that what needs to be autocompleted is the full set of possible nextwords, and not extend the last word */ diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 9007d373469..2841a32d589 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -2601,7 +2601,7 @@ gf_cli3_1_replace_brick (call_frame_t *frame, xlator_t *this, } gf_log (this->name, GF_LOG_DEBUG, - "Recevied command replace-brick %s with " + "Received command replace-brick %s with " "%s with operation=%d", src_brick, dst_brick, op); diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 3c8042312b1..20a05f1d628 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -944,9 +944,9 @@ out: } /* Function has 3types of return value 0, -ve , 1 - * return 0 =======> reconfiguration of options has succeded + * return 0 =======> reconfiguration of options has succeeded * return 1 =======> the graph has to be reconstructed and all the xlators should be inited - * return -1(or -ve) =======> Some Internal Error occured during the operation + * return -1(or -ve) =======> Some Internal Error occurred during the operation */ static int glusterfs_volfile_reconfigure (FILE *newvolfile_fp) @@ -1005,7 +1005,7 @@ glusterfs_volfile_reconfigure (FILE *newvolfile_fp) if (!oldvolfile_graph) { gf_log ("glusterfsd-mgmt", GF_LOG_ERROR, - "glsuterfs_ctx->active is NULL"); + "glusterfs_ctx->active is NULL"); goto out; } @@ -1077,9 +1077,9 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count, /* Check if only options have changed. No need to reload the * volfile if topology hasn't changed. * glusterfs_volfile_reconfigure returns 3 possible return states - * return 0 =======> reconfiguration of options has succeded + * return 0 =======> reconfiguration of options has succeeded * return 1 =======> the graph has to be reconstructed and all the xlators should be inited - * return -1(or -ve) =======> Some Internal Error occured during the operation + * return -1(or -ve) =======> Some Internal Error occurred during the operation */ ret = glusterfs_volfile_reconfigure (tmpfp); diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 2a114e2139d..d02c4b7a960 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -795,7 +795,7 @@ cleanup_and_exit (int signum) exit (0); #if 0 - /* TODO: Properly do cleanup_and_exit(), with synchronisations */ + /* TODO: Properly do cleanup_and_exit(), with synchronization */ if (ctx->mgmt) rpc_clnt_unref (ctx->mgmt); @@ -834,7 +834,7 @@ reincarnate (int signum) ret = glusterfs_volumes_init (ctx); } - /* Also, SIGHUP should do logroate */ + /* Also, SIGHUP should do logrotate */ gf_log_logrotate (1); if (ret < 0) @@ -1139,7 +1139,7 @@ parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx) if (((ret == 0) && (S_ISREG (stbuf.st_mode) || S_ISLNK (stbuf.st_mode))) || (ret == -1)) { - /* Have seperate logfile per run */ + /* Have separate logfile per run */ tm = localtime (&utime); strftime (timestr, 256, "%Y%m%d.%H%M%S", tm); sprintf (tmp_logfile, "%s.%s.%d", diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index bd12519b963..47b42aef4d2 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -286,7 +286,7 @@ gf_fd_put (fdtable_t *fdtable, int32_t fd) * without doing anything. * This has the potential of masking out any bugs in a user of * fd that ends up calling gf_fd_put twice for the same fd or - * for an unallocated fd, but thats a price we have to pay for + * for an unallocated fd, but it is a price we have to pay for * ensuring sanity of our fd-table. */ if (fde->next_free != GF_FDENTRY_ALLOCATED) @@ -385,7 +385,7 @@ fd_destroy (fd_t *fd) xlator_t *old_THIS = NULL; if (fd == NULL){ - gf_log_callingfn ("xlator", GF_LOG_ERROR, "invalid arugument"); + gf_log_callingfn ("xlator", GF_LOG_ERROR, "invalid argument"); goto out; } diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c index 4cad56dd906..f94723ba352 100644 --- a/libglusterfs/src/mem-pool.c +++ b/libglusterfs/src/mem-pool.c @@ -434,7 +434,7 @@ mem_get (struct mem_pool *mem_pool) /* This is a problem area. If we've run out of * chunks in our slab above, we need to allocate * enough memory to service this request. - * The problem is, these indvidual chunks will fail + * The problem is, these individual chunks will fail * the first address range check in __is_member. Now, since * we're not allocating a full second slab, we wont have * enough info perform the range check in __is_member. diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index f01ece0cda7..6f1fbfc1591 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -1279,7 +1279,7 @@ rpc_clnt_record (struct rpc_clnt *clnt, call_frame_t *call_frame, //rpc_transport_get_myname (clnt->conn.trans, myname, UNIX_PATH_MAX); //au.aup_machname = myname; - /* Assuming the client program would like to speak to the same versioned + /* Assuming the client program would like to speak to the same version of * program on server. */ request_iob = rpc_clnt_record_build_record (clnt, prog->prognum, diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h index e3fb1712848..ff859c2e9f5 100644 --- a/rpc/rpc-lib/src/rpc-transport.h +++ b/rpc/rpc-lib/src/rpc-transport.h @@ -45,10 +45,10 @@ #endif /* AI_ADDRCONFIG */ /* Given the 4-byte fragment header, returns non-zero if this fragment - * is the last fragment for the RPC record being assemebled. + * is the last fragment for the RPC record being assembled. * RPC Record marking standard defines a 32 bit value as the fragment * header with the MSB signifying whether the fragment is the last - * fragment for the record being asembled. + * fragment for the record being assembled. */ #define RPC_LASTFRAG(fraghdr) ((uint32_t)(fraghdr & 0x80000000U)) diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h index c6f4325443d..ffdc306e600 100644 --- a/rpc/rpc-lib/src/rpcsvc.h +++ b/rpc/rpc-lib/src/rpcsvc.h @@ -187,8 +187,8 @@ struct rpcsvc_request { uint64_t lk_owner; uint64_t gfs_id; - /* Might want to move this to AUTH_UNIX specifix state since this array - * is not available for every authenticatino scheme. + /* Might want to move this to AUTH_UNIX specific state since this array + * is not available for every authentication scheme. */ gid_t auxgids[NGRPS]; int auxgidcount; @@ -217,8 +217,8 @@ struct rpcsvc_request { int auth_err; /* There can be cases of RPC requests where the reply needs to - * be built from multiple sources. For eg. where even the NFS reply can - * contain a payload, as in the NFSv3 read reply. Here the RPC header + * be built from multiple sources. E.g. where even the NFS reply + * can contain a payload, as in the NFSv3 read reply. Here the RPC header * ,NFS header and the read data are brought together separately from * different buffers, so we need to stage the buffers temporarily here * before all of them get added to the connection's transmission list. @@ -323,7 +323,7 @@ typedef struct rpcsvc_actor_desc { * the XDR scheme, RPC cannot guarantee memory aligned addresses for * the resulting message-specific structures. Allowing a specialized * handler for letting the RPC program read the data from the network - * directly into its alligned buffers. + * directly into its aligned buffers. */ rpcsvc_vector_actor vector_actor; rpcsvc_vector_sizer vector_sizer; diff --git a/rpc/rpc-lib/src/xdr-common.h b/rpc/rpc-lib/src/xdr-common.h index a93f9540ac8..8402a62225e 100644 --- a/rpc/rpc-lib/src/xdr-common.h +++ b/rpc/rpc-lib/src/xdr-common.h @@ -115,7 +115,7 @@ xdr_to_dump_rsp (struct iovec inmsg, void *args); /* Returns the address of the byte that follows the * last byte used for decoding the previous xdr component. - * For eg, once the RPC call for NFS has been decoded, thie macro will return + * E.g. once the RPC call for NFS has been decoded, the macro will return * the address from which the NFS header starts. */ #define xdr_decoded_remaining_addr(xdr) ((&xdr)->x_private) diff --git a/rpc/rpc-lib/src/xdr-rpc.c b/rpc/rpc-lib/src/xdr-rpc.c index 58a8a5fe6fe..e4e5b108710 100644 --- a/rpc/rpc-lib/src/xdr-rpc.c +++ b/rpc/rpc-lib/src/xdr-rpc.c @@ -117,7 +117,7 @@ rpc_fill_denied_reply (struct rpc_msg *reply, int rjstat, int auth_err) reply->rm_reply.rp_stat = MSG_DENIED; reply->rjcted_rply.rj_stat = rjstat; if (rjstat == RPC_MISMATCH) { - /* No problem with hardocoding + /* No problem with hardcoding * RPC version numbers. We only support * v2 anyway. */ diff --git a/rpc/rpc-lib/src/xdr-rpc.h b/rpc/rpc-lib/src/xdr-rpc.h index 5dbbbe580db..99ad888361c 100644 --- a/rpc/rpc-lib/src/xdr-rpc.h +++ b/rpc/rpc-lib/src/xdr-rpc.h @@ -62,7 +62,7 @@ rpc_reply_to_xdr (struct rpc_msg *reply, char *dest, size_t len, extern int xdr_to_auth_unix_cred (char *msgbuf, int msglen, struct authunix_parms *au, char *machname, gid_t *gids); -/* Macros that simplify accesing the members of an RPC call structure. */ +/* Macros that simplify accessing the members of an RPC call structure. */ #define rpc_call_xid(call) ((call)->rm_xid) #define rpc_call_direction(call) ((call)->rm_direction) #define rpc_call_rpcvers(call) ((call)->ru.RM_cmb.cb_rpcvers) diff --git a/rpc/rpc-lib/src/xdr-rpcclnt.h b/rpc/rpc-lib/src/xdr-rpcclnt.h index aaba00df03f..3bcf5b54b94 100644 --- a/rpc/rpc-lib/src/xdr-rpcclnt.h +++ b/rpc/rpc-lib/src/xdr-rpcclnt.h @@ -33,7 +33,7 @@ #include <rpc/rpc_msg.h> #include <rpc/auth_unix.h> -/* Macros that simplify accesing the members of an RPC call structure. */ +/* Macros that simplify accessing the members of an RPC call structure. */ #define rpc_reply_xid(reply) ((reply)->rm_xid) #define rpc_reply_status(reply) ((reply)->ru.RM_rmb.rp_stat) #define rpc_accepted_reply_status(reply) ((reply)->acpted_rply.ar_stat) diff --git a/rpc/rpc-transport/rdma/src/name.c b/rpc/rpc-transport/rdma/src/name.c index 5d6c81d5f04..702c8a86a6b 100644 --- a/rpc/rpc-transport/rdma/src/name.c +++ b/rpc/rpc-transport/rdma/src/name.c @@ -95,7 +95,7 @@ af_unix_client_bind (rpc_transport_t *this, char *path = data_to_str (path_data); if (!path || strlen (path) > UNIX_PATH_MAX) { gf_log (this->name, GF_LOG_DEBUG, - "transport.rdma.bind-path not specfied " + "transport.rdma.bind-path not specified " "for unix socket, letting connect to assign " "default value"); goto err; diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c index a3f6e3f59c0..6a83a3e447b 100644 --- a/rpc/rpc-transport/rdma/src/rdma.c +++ b/rpc/rpc-transport/rdma/src/rdma.c @@ -3317,7 +3317,7 @@ rdma_recv_completion_proc (void *data) /* * keep a refcount on transport so that it - * doesnot get freed because of some error + * does not get freed because of some error * indicated by wc.status till we are done * with usage of peer and thereby that of trans. */ diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index 8de1c5fcd42..bed59d58b70 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -96,7 +96,7 @@ af_unix_client_bind (rpc_transport_t *this, char *path = data_to_str (path_data); if (!path || strlen (path) > UNIX_PATH_MAX) { gf_log (this->name, GF_LOG_TRACE, - "bind-path not specfied for unix socket, " + "bind-path not specified for unix socket, " "letting connect to assign default value"); goto err; } @@ -112,7 +112,7 @@ af_unix_client_bind (rpc_transport_t *this, } } else { gf_log (this->name, GF_LOG_TRACE, - "bind-path not specfied for unix socket, " + "bind-path not specified for unix socket, " "letting connect to assign default value"); } diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 089afb573d5..0fd031d8912 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -318,7 +318,7 @@ __socket_server_bind (rpc_transport_t *this) strerror (errno)); } - //reuse-address doesnt work for unix type sockets + /* reuse-address doesn't work for unix type sockets */ if (AF_UNIX == SA (&this->myinfo.sockaddr)->sa_family) { memcpy (&unix_addr, SA (&this->myinfo.sockaddr), this->myinfo.sockaddr_len); @@ -2160,7 +2160,7 @@ socket_listen (rpc_transport_t *this) if (sock != -1) { gf_log_callingfn (this->name, GF_LOG_DEBUG, - "alreading listening"); + "already listening"); return ret; } diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 99305b718fa..25973e4eaf1 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -3447,7 +3447,7 @@ afr_notify (xlator_t *this, int32_t event, /* parent xlators dont need to know about every child_up, child_down * because of afr ha. If all subvolumes go down, child_down has * to be triggered. In that state when 1 subvolume comes up child_up - * needs to be triggered. dht optimises revalidate lookup by sending + * needs to be triggered. dht optimizes revalidate lookup by sending * it only to one of its subvolumes. When child up/down happens * for afr's subvolumes dht should be notified by child_modified. The * subsequent revalidate lookup happens on all the dht's subvolumes diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c index f2e6760cfd7..f5a7b47a41f 100644 --- a/xlators/cluster/afr/src/afr-dir-read.c +++ b/xlators/cluster/afr/src/afr-dir-read.c @@ -272,7 +272,7 @@ unlock: * to regular entry self-heal because the readdir * call is sent only to the first subvolume, and * thus files that exist only there will never be healed - * otherwise (assuming changelog shows no anamolies). + * otherwise (assuming changelog shows no anomalies). */ gf_log (this->name, GF_LOG_TRACE, @@ -603,7 +603,7 @@ afr_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (list_empty (&entries->list)) { /* All the entries we got were duplicate. We shouldn't send an empty list now, because - that'll make the application stop reading. So + that will make the application stop reading. So try to get more entries */ gf_log (this->name, GF_LOG_TRACE, diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c index 33ddb9db11b..82b9427caeb 100644 --- a/xlators/cluster/afr/src/afr-lk-common.c +++ b/xlators/cluster/afr/src/afr-lk-common.c @@ -1183,7 +1183,7 @@ afr_nonblocking_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (call_count == 0) { gf_log (this->name, GF_LOG_TRACE, "Last locking reply received"); - /* all locks successfull. Proceed to call FOP */ + /* all locks successful. Proceed to call FOP */ if (int_lock->entrylk_lock_count == int_lock->lk_expected_count) { gf_log (this->name, GF_LOG_TRACE, @@ -1191,7 +1191,7 @@ afr_nonblocking_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int_lock->lock_op_ret = 0; int_lock->lock_cbk (frame, this); } - /* Not all locks were successfull. Unlock and try locking + /* Not all locks were successful. Unlock and try locking again, this time with serially blocking locks */ else { gf_log (this->name, GF_LOG_TRACE, @@ -1376,7 +1376,7 @@ afr_nonblocking_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (call_count == 0) { gf_log (this->name, GF_LOG_TRACE, "Last inode locking reply received"); - /* all locks successfull. Proceed to call FOP */ + /* all locks successful. Proceed to call FOP */ if (int_lock->inodelk_lock_count == int_lock->lk_expected_count) { gf_log (this->name, GF_LOG_TRACE, @@ -1384,7 +1384,7 @@ afr_nonblocking_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int_lock->lock_op_ret = 0; int_lock->lock_cbk (frame, this); } - /* Not all locks were successfull. Unlock and try locking + /* Not all locks were successful. Unlock and try locking again, this time with serially blocking locks */ else { gf_log (this->name, GF_LOG_TRACE, diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index b11be387258..57d069ddcc3 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -316,7 +316,7 @@ afr_sh_wise_nodes_exist (afr_node_character *characters, int child_count) * It is 1 if no other wise node accuses it. * Only wise nodes with wisdom 1 are sources. * - * If no nodes with wisdom 1 exist, a split-brain has occured. + * If no nodes with wisdom 1 exist, a split-brain has occurred. */ static void diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c index 12cba1f492a..98ef82fe5ce 100644 --- a/xlators/cluster/afr/src/afr-self-heal-entry.c +++ b/xlators/cluster/afr/src/afr-self-heal-entry.c @@ -704,7 +704,7 @@ afr_sh_entry_expunge_entry (call_frame_t *frame, xlator_t *this, } gf_log (this->name, GF_LOG_TRACE, - "inspecting existance of %s under %s", + "inspecting existence of %s under %s", name, local->loc.path); expunge_frame = copy_frame (frame); @@ -1762,7 +1762,7 @@ afr_sh_entry_impunge_entry (call_frame_t *frame, xlator_t *this, } gf_log (this->name, GF_LOG_TRACE, - "inspecting existance of %s under %s", + "inspecting existence of %s under %s", entry->d_name, local->loc.path); entry_mode = st_mode_from_ia (entry->d_stat.ia_prot, diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 7a3c3ddd90f..0998eef0d68 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -306,7 +306,7 @@ dht_revalidate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, strerror (op_errno)); } if (op_errno == ESTALE) { - /* propogate the ESTALE to parent. + /* propagate the ESTALE to parent. * setting local->return_estale would send * ESTALE to parent. */ local->return_estale = 1; @@ -2317,7 +2317,7 @@ dht_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, orig_entry->d_name); if (!subvol || (subvol != prev->this)) { /* TODO: Count the number of entries which need - linkfile to prove its existance in fs */ + linkfile to prove its existence in fs */ layout->search_unhashed++; } } diff --git a/xlators/cluster/dht/src/dht-layout.c b/xlators/cluster/dht/src/dht-layout.c index 7e1f7afda70..33dcc4067b0 100644 --- a/xlators/cluster/dht/src/dht-layout.c +++ b/xlators/cluster/dht/src/dht-layout.c @@ -485,7 +485,7 @@ dht_layout_anomalies (xlator_t *this, loc_t *loc, dht_layout_t *layout, uint32_t last_stop = 0; char is_virgin = 1; - /* TODO: explain WTF is happening */ + /* TODO: explain what is happening */ last_stop = layout->list[0].start - 1; prev_stop = last_stop; diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c index 1c881be39b7..3342c35a99c 100644 --- a/xlators/cluster/dht/src/dht-selfheal.c +++ b/xlators/cluster/dht/src/dht-selfheal.c @@ -230,7 +230,7 @@ dht_selfheal_dir_xattr (call_frame_t *frame, loc_t *loc, dht_layout_t *layout) for (i = 0; i < layout->cnt; i++) { if (layout->list[i].err != -1 || !layout->list[i].stop) { /* err != -1 would mean xattr present on the directory - * or the directory is itself non existant. + * or the directory is non existent. * !layout->list[i].stop would mean layout absent */ diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c index 7b32a9766a9..c5bb36be05c 100644 --- a/xlators/cluster/dht/src/dht.c +++ b/xlators/cluster/dht/src/dht.c @@ -299,12 +299,12 @@ reconfigure (xlator_t *this, dict_t *options) if (strcasecmp (temp_str, "auto")) { if (!gf_string2boolean (temp_str, &search_unhashed)) { gf_log(this->name, GF_LOG_DEBUG, "Reconfigure:" - " lookup-unahashed reconfigured (%s)", + " lookup-unhashed reconfigured (%s)", temp_str); conf->search_unhashed = search_unhashed; } else { gf_log(this->name, GF_LOG_ERROR, "Reconfigure:" - " lookup-unahashed should be boolean," + " lookup-unhashed should be boolean," " not (%s), defaulting to (%d)", temp_str, conf->search_unhashed); //return -1; @@ -313,7 +313,7 @@ reconfigure (xlator_t *this, dict_t *options) } } else { gf_log(this->name, GF_LOG_DEBUG, "Reconfigure:" - " lookup-unahashed reconfigured auto "); + " lookup-unhashed reconfigured auto "); conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_AUTO; } } diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c index 925687534c7..af60102c16f 100644 --- a/xlators/cluster/stripe/src/stripe.c +++ b/xlators/cluster/stripe/src/stripe.c @@ -19,7 +19,7 @@ /** * xlators/cluster/stripe: - * Stripe translator, stripes the data accross its child nodes, + * Stripe translator, stripes the data across its child nodes, * as per the options given in the volfile. The striping works * fairly simple. It writes files at different offset as per * calculation. So, 'ls -l' output at the real posix level will diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 52ff6e08e3d..c40ef7245c9 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -358,7 +358,7 @@ marker_specific_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, ret = marker_trav_parent (local); if (ret == -1) { - gf_log (this->name, GF_LOG_DEBUG, "Error occured " + gf_log (this->name, GF_LOG_DEBUG, "Error occurred " "while traversing to the parent, stopping marker"); done = 1; @@ -841,7 +841,7 @@ marker_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_conf_t *priv = NULL; if (op_ret == -1) { - gf_log (this->name, GF_LOG_TRACE, "%s occured while " + gf_log (this->name, GF_LOG_TRACE, "%s occurred while " "linking a file ", strerror (op_errno)); } @@ -1069,7 +1069,7 @@ marker_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, local->err = op_errno; } - gf_log (this->name, GF_LOG_TRACE, "%s occured while " + gf_log (this->name, GF_LOG_TRACE, "%s occurred while " "renaming a file ", strerror (op_errno)); } @@ -1463,7 +1463,7 @@ marker_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_conf_t *priv = NULL; if (op_ret == -1) { - gf_log (this->name, GF_LOG_TRACE, "%s occured while " + gf_log (this->name, GF_LOG_TRACE, "%s occurred while " "truncating a file ", strerror (op_errno)); } @@ -1531,7 +1531,7 @@ marker_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_conf_t *priv = NULL; if (op_ret == -1) { - gf_log (this->name, GF_LOG_TRACE, "%s occured while " + gf_log (this->name, GF_LOG_TRACE, "%s occurred while " "truncating a file ", strerror (op_errno)); } @@ -1599,7 +1599,7 @@ marker_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_local_t *local = NULL; if (op_ret == -1) { - gf_log (this->name, GF_LOG_TRACE, "%s occured while " + gf_log (this->name, GF_LOG_TRACE, "%s occurred while " "creating symlinks ", strerror (op_errno)); } @@ -1668,7 +1668,7 @@ marker_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_conf_t *priv = NULL; if (op_ret == -1) { - gf_log (this->name, GF_LOG_TRACE, "%s occured while " + gf_log (this->name, GF_LOG_TRACE, "%s occurred while " "creating symlinks ", strerror (op_errno)); } @@ -1799,7 +1799,7 @@ marker_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_conf_t *priv = NULL; if (op_ret == -1) { - gf_log (this->name, GF_LOG_TRACE, "%s occured while " + gf_log (this->name, GF_LOG_TRACE, "%s occurred while " "creating symlinks ", strerror (op_errno)); } @@ -1866,7 +1866,7 @@ marker_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_conf_t *priv = NULL; if (op_ret == -1) { - gf_log (this->name, GF_LOG_TRACE, "%s occured while " + gf_log (this->name, GF_LOG_TRACE, "%s occurred while " "creating symlinks ", strerror (op_errno)); } @@ -1934,7 +1934,7 @@ marker_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_conf_t *priv = NULL; if (op_ret == -1) { - gf_log (this->name, GF_LOG_ERROR, "%s occured while " + gf_log (this->name, GF_LOG_ERROR, "%s occurred while " "creating symlinks ", strerror (op_errno)); } @@ -2006,7 +2006,7 @@ marker_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (op_ret == -1) { gf_log (this->name, ((op_errno == ENOENT) ? GF_LOG_DEBUG : GF_LOG_ERROR), - "%s occured during setattr of %s", + "%s occurred during setattr of %s", strerror (op_errno), (local ? local->loc.path : "<nul>")); } @@ -2067,7 +2067,7 @@ marker_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_conf_t *priv = NULL; if (op_ret == -1) { - gf_log (this->name, GF_LOG_ERROR, "%s occured while " + gf_log (this->name, GF_LOG_ERROR, "%s occurred while " "creating symlinks ", strerror (op_errno)); } diff --git a/xlators/lib/src/libxlator.c b/xlators/lib/src/libxlator.c index 3991d80ff09..df302d11d0a 100644 --- a/xlators/lib/src/libxlator.c +++ b/xlators/lib/src/libxlator.c @@ -395,7 +395,7 @@ cluster_getmarkerattr (call_frame_t *frame,xlator_t *this, loc_t *loc, loc, name); else { gf_log (this->name, GF_LOG_WARNING, - "Unrecognized type of marker attr recived"); + "Unrecognized type of marker attr received"); STACK_WIND (frame, default_getxattr_cbk, *(sub_volumes + i), (*(sub_volumes + i))->fops->getxattr, diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index 3f56636cdf0..db43ecb4d31 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -1764,7 +1764,7 @@ _iterate_log_rotate_mst_slv (dict_t *this, char *key, data_t *value, void *data) slave++; else { gf_log ("", GF_LOG_ERROR, "geo-replication log-rotate: slave (%s) " - "not comfirming to format", slave); + "not conforming to format", slave); return; } diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 225bf6791f1..8f2d55aaf3a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -3241,7 +3241,7 @@ glusterd_op_sm_inject_event (glusterd_op_sm_event_type_t event_type, event->ctx = ctx; - gf_log ("glusterd", GF_LOG_DEBUG, "Enqueuing event: '%s'", + gf_log ("glusterd", GF_LOG_DEBUG, "Enqueue event: '%s'", glusterd_op_sm_event_name_get (event->event)); list_add_tail (&event->list, &gd_op_sm_queue); diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index a556e335b95..08865f38f18 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -371,7 +371,7 @@ int glusterd_defrag_stop (glusterd_volinfo_t *volinfo, u_quad_t *files, u_quad_t *size, char *op_errstr, size_t len) { - /* TODO: set a variaeble 'stop_defrag' here, it should be checked + /* TODO: set a variable 'stop_defrag' here, it should be checked in defrag loop */ int ret = -1; GF_ASSERT (volinfo); diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c index 640fd07e0e1..e883b289f9f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c +++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c @@ -1355,7 +1355,7 @@ out: return ret; } -/* Set src-brick's port number to be used in the maintainance mount +/* Set src-brick's port number to be used in the maintenance mount * after all commit acks are received. */ static int @@ -1840,7 +1840,7 @@ glusterd_do_replace_brick (void *data) gf_timer_call_cancel (THIS->ctx, priv->timer); priv->timer = NULL; gf_log ("", GF_LOG_DEBUG, - "Cancelled timer thread"); + "Cancelling timer thread"); } gf_log ("", GF_LOG_DEBUG, diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c index 8b572afbff6..853fd931d22 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c @@ -366,7 +366,7 @@ out: GF_ASSERT (ctx); - if (ctx->req)//reverse probe doesnt have req + if (ctx->req)//reverse probe doesn't have req ret = glusterd_xfer_cli_probe_resp (ctx->req, op_ret, op_errno, ctx->hostname, ctx->port); if (!ret) { diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c index 2518ee0d496..259c247f401 100644 --- a/xlators/mgmt/glusterd/src/glusterd-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-sm.c @@ -925,7 +925,7 @@ int glusterd_friend_sm_inject_event (glusterd_friend_sm_event_t *event) { GF_ASSERT (event); - gf_log ("glusterd", GF_LOG_DEBUG, "Enqueuing event: '%s'", + gf_log ("glusterd", GF_LOG_DEBUG, "Enqueue event: '%s'", glusterd_friend_sm_event_name_get (event->event)); list_add_tail (&event->list, &gd_friend_sm_queue); diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 2ade1c57431..0de937badf1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -982,7 +982,7 @@ glusterd_check_option_exists (char *key, char **completion) ret = volopt_trie (key, completion); if (ret) { gf_log ("", GF_LOG_ERROR, - "Some error occured during keyword hinting"); + "Some error occurred during keyword hinting"); } return ret; diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 1393a47a311..62726b38f41 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -562,7 +562,7 @@ fuse_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this, * is left intact upon open, setting * FOPEN_PURGE_UBC implies purge * - * [[Innnnteresting...]] + * [[Interesting...]] */ foo.open_flags |= FOPEN_PURGE_UBC; #endif @@ -3168,7 +3168,7 @@ fuse_thread_proc (void *data) iobuf = iobuf_get (this->ctx->iobuf_pool); /* Add extra 128 byte to the first iov so that it can - * accomodate "ordinary" non-write requests. It's not + * accommodate "ordinary" non-write requests. It's not * guaranteed to be big enough, as SETXATTR and namespace * operations with very long names may grow behind it, * but it's good enough in most cases (and we can handle diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 1b9fcfd103e..b1e5639870f 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -391,7 +391,7 @@ mnt3svc_volume_mount (rpcsvc_request_t *req, struct mount3_state *ms, rootgfid[15] = 1; exportinode = inode_find (exp->vol->itable, rootgfid); if (!exportinode) { - gf_log (GF_MNT, GF_LOG_ERROR, "Faild to get root inode"); + gf_log (GF_MNT, GF_LOG_ERROR, "Failed to get root inode"); ret = -ENOENT; goto err; } diff --git a/xlators/nfs/server/src/mount3.h b/xlators/nfs/server/src/mount3.h index 7b63760affd..c0eae36440f 100644 --- a/xlators/nfs/server/src/mount3.h +++ b/xlators/nfs/server/src/mount3.h @@ -53,7 +53,7 @@ mnt1svc_init (xlator_t *nfsx); extern int mount_init_state (xlator_t *nfsx); -/* Data structureused to store the list of mounts points currently +/* Data structure used to store the list of mounts points currently * in use by NFS clients. */ struct mountentry { diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c index d9b419c4e16..428c82a8fda 100644 --- a/xlators/nfs/server/src/nfs-fops.c +++ b/xlators/nfs/server/src/nfs-fops.c @@ -1122,7 +1122,7 @@ nfs_fop_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfl_to_prog_data (nfl, progcbk, frame); /* The preattr arg needs to be NULL instead of @buf because it is * possible that the new parent is not root whereas the source dir - * could've been. That is handled in the next macro. + * could have been. That is handled in the next macro. */ nfs_fop_restore_root_ino (nfl, op_ret, NULL, NULL, preoldparent, postoldparent); diff --git a/xlators/nfs/server/src/nfs-generics.h b/xlators/nfs/server/src/nfs-generics.h index 8bc0f5548b1..237a0ad09bc 100644 --- a/xlators/nfs/server/src/nfs-generics.h +++ b/xlators/nfs/server/src/nfs-generics.h @@ -43,7 +43,7 @@ struct nfs_direntcache { * different NFS versions can simply call a standard interface and have fop * interface dependent functions be handled internally. * This structure is part of such an abstraction. The fops layer stores any - * state is requires in the fd. For eg, the dirent cache for a directory fd_t. + * state is requires in the fd. E.g. the dirent cache for a directory fd_t. */ typedef struct nfs_fop_fdcontext { pthread_mutex_t lock; diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c index 25ea340dba4..2070d196add 100644 --- a/xlators/nfs/server/src/nfs3-helpers.c +++ b/xlators/nfs/server/src/nfs3-helpers.c @@ -694,7 +694,7 @@ nfs3_fill_entry3 (gf_dirent_t *entry, struct nfs3_fh *dfh) /* If the entry is . or .., we need to replace the physical ino and gen * with 1 and 0 respectively if the directory is root. This funging is * needed because there is no parent directory of the root. In that - * sense the behavious we provide is similar to the output of the + * sense the behavior we provide is similar to the output of the * command: "stat /.." */ entry->d_ino = nfs3_iatt_gfid_to_ino (&entry->d_stat); @@ -763,7 +763,7 @@ nfs3_fill_entryp3 (gf_dirent_t *entry, struct nfs3_fh *dirfh, uint64_t devid) /* If the entry is . or .., we need to replace the physical ino and gen * with 1 and 0 respectively if the directory is root. This funging is * needed because there is no parent directory of the root. In that - * sense the behavious we provide is similar to the output of the + * sense the behavior we provide is similar to the output of the * command: "stat /.." */ entry->d_ino = nfs3_iatt_gfid_to_ino (&entry->d_stat); diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c index 900321000b2..d78360502a1 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -5194,7 +5194,7 @@ nfs3_init_options (struct nfs3_state *nfs3, xlator_t *nfsx) nfs3->iobsize = nfs3->readdirsize; /* But this is the true size of each iobuf. We need this size to - * accomodate the NFS headers also in the same buffer. */ + * accommodate the NFS headers also in the same buffer. */ nfs3->iobsize = nfs3->iobsize * 2; /* mem-factor */ diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c index fb12b24c04c..7db1e686f7d 100644 --- a/xlators/performance/quick-read/src/quick-read.c +++ b/xlators/performance/quick-read/src/quick-read.c @@ -745,7 +745,7 @@ qr_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, { /* * we really need not set this flag, since open is - * not yet unwounded. + * not yet unwound. */ qr_fd_ctx->open_in_transit = 1; diff --git a/xlators/performance/read-ahead/src/read-ahead.c b/xlators/performance/read-ahead/src/read-ahead.c index e49709c0ea8..6d7641e6909 100644 --- a/xlators/performance/read-ahead/src/read-ahead.c +++ b/xlators/performance/read-ahead/src/read-ahead.c @@ -21,7 +21,7 @@ TODO: - handle O_DIRECT - maintain offset, flush on lseek - - ensure efficient memory managment in case of random seek + - ensure efficient memory management in case of random seek */ #ifndef _CONFIG_H diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c index 2bedac38f6c..1555a79a75b 100644 --- a/xlators/performance/write-behind/src/write-behind.c +++ b/xlators/performance/write-behind/src/write-behind.c @@ -312,7 +312,7 @@ wb_file_create (xlator_t *this, fd_t *fd, int32_t flags) INIT_LIST_HEAD (&file->passive_requests); /* - fd_ref() not required, file should never decide the existance of + fd_ref() not required, file should never decide the existence of an fd */ file->fd= fd; @@ -1371,7 +1371,7 @@ wb_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, LOCK (&file->lock); { - /* If O_DIRECT then, we disable chaching */ + /* If O_DIRECT then, we disable caching */ if (((flags & O_DIRECT) == O_DIRECT) || ((flags & O_ACCMODE) == O_RDONLY) || (((flags & O_SYNC) == O_SYNC) @@ -1449,7 +1449,7 @@ wb_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, LOCK (&file->lock); { - /* If O_DIRECT then, we disable chaching */ + /* If O_DIRECT then, we disable caching */ if (frame->local) { if (((flags & O_DIRECT) == O_DIRECT) || ((flags & O_ACCMODE) == O_RDONLY) @@ -2025,7 +2025,7 @@ wb_process_queue (call_frame_t *frame, wb_file_t *file) { /* * make sure requests are marked for unwinding and adjacent - * continguous write buffers (each of size less than that of + * contiguous write buffers (each of size less than that of * an iobuf) are packed properly so that iobufs are filled to * their maximum capacity, before calling __wb_mark_winds. */ diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index ccbc0afdc38..87a4603c191 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -2019,7 +2019,7 @@ client_destroy_rpc (xlator_t *this) } gf_log (this->name, GF_LOG_WARNING, - "RPC destory called on already destroyed " + "RPC destroy called on already destroyed " "connection"); out: diff --git a/xlators/protocol/legacy/transport/socket/src/socket.c b/xlators/protocol/legacy/transport/socket/src/socket.c index e0f2aee4dbb..9272b058494 100644 --- a/xlators/protocol/legacy/transport/socket/src/socket.c +++ b/xlators/protocol/legacy/transport/socket/src/socket.c @@ -1194,7 +1194,7 @@ socket_listen (transport_t *this) if (sock != -1) { gf_log (this->xl->name, GF_LOG_DEBUG, - "alreading listening"); + "already listening"); return ret; } |