summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xlators/cluster/afr/src/afr-inode-write.c2
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-metadata.c2
-rw-r--r--xlators/cluster/afr/src/pump.h2
-rw-r--r--xlators/cluster/dht/src/dht-common.c4
-rw-r--r--xlators/cluster/dht/src/dht-common.h2
-rw-r--r--xlators/cluster/dht/src/dht-layout.c2
-rw-r--r--xlators/cluster/map/src/map.c2
-rw-r--r--xlators/encryption/crypt/src/crypt.c2
-rw-r--r--xlators/encryption/crypt/src/crypt.h2
-rw-r--r--xlators/encryption/crypt/src/metadata.c2
-rw-r--r--xlators/features/changelog/lib/src/gf-history-changelog.c4
-rw-r--r--xlators/features/changelog/src/changelog-helpers.h3
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-brick-ops.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-messages.h4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-peer-utils.c8
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-rebalance.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-snapshot.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-store.c2
-rw-r--r--xlators/nfs/server/src/mount3.c4
-rw-r--r--xlators/protocol/client/src/client-handshake.c2
-rw-r--r--xlators/storage/posix/src/posix.c2
23 files changed, 34 insertions, 31 deletions
diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c
index 7769338..f712166 100644
--- a/xlators/cluster/afr/src/afr-inode-write.c
+++ b/xlators/cluster/afr/src/afr-inode-write.c
@@ -369,7 +369,7 @@ afr_do_writev (call_frame_t *frame, xlator_t *this)
/*
* Backend vfs ignores the 'offset' for append mode fd so
* locking just the region provided for the writev does not
- * give consistency gurantee. The actual write may happen at a
+ * give consistency guarantee. The actual write may happen at a
* completely different range than the one provided by the
* offset, len in the fop. So lock the entire file.
*/
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c
index 7333f93..b08bd4e 100644
--- a/xlators/cluster/afr/src/afr-self-heal-metadata.c
+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c
@@ -116,7 +116,7 @@ mtime_ns(struct iatt *ia)
/*
* When directory content is modified, [mc]time is updated. On
* Linux, the filesystem does it, while at least on NetBSD, the
- * kernel file-system independant code does it. This means that
+ * kernel file-system independent code does it. This means that
* when entries are added while bricks are down, the kernel sends
* a SETATTR [mc]time which will cause metadata split brain for
* the directory. In this case, clear the split brain by finding
diff --git a/xlators/cluster/afr/src/pump.h b/xlators/cluster/afr/src/pump.h
index 9d0b6db..7d5acd0 100644
--- a/xlators/cluster/afr/src/pump.h
+++ b/xlators/cluster/afr/src/pump.h
@@ -30,7 +30,7 @@ typedef enum {
PUMP_STATE_RESUME, /* Pump is resuming from a previous pause */
PUMP_STATE_PAUSE, /* Pump is paused */
PUMP_STATE_ABORT, /* Pump is aborted */
- PUMP_STATE_COMMIT, /* Pump is commited */
+ PUMP_STATE_COMMIT, /* Pump is committed */
} pump_state_t;
typedef struct _pump_private {
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index b7df1f4..9a98ebf 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -989,7 +989,7 @@ dht_lookup_unlink_of_false_linkto_cbk (call_frame_t *frame, void *cookie,
*lookup_everywhere and one where unlink-failed. So
*at this point in time we cannot decide which one to
*choose because there are chances of first cached
- *file is truncated after rebalance and if it is choosen
+ *file is truncated after rebalance and if it is chosen
*as cached node, application will fail. So return EIO.*/
if (op_errno == EBUSY) {
@@ -1150,7 +1150,7 @@ dht_lookup_everywhere_done (call_frame_t *frame, xlator_t *this)
* If this lookup is performed by rebalance and this
* rebalance process detected hashed file and by
* the time it sends the lookup request to cached node,
- * file got migrated and now at intial hashed_node,
+ * file got migrated and now at initial hashed_node,
* final migrated file is present. With current logic,
* because this process fails to find the cached_node,
* it will unlink the file at initial hashed_node.
diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h
index 9d505c1..3ca626f 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -364,7 +364,7 @@ struct dht_conf {
/* Will be a global flag to control the layout spread count */
uint32_t dir_spread_cnt;
- /* to keep track of nodes which are decomissioned */
+ /* to keep track of nodes which are decommissioned */
xlator_t **decommissioned_bricks;
int decommission_in_progress;
int decommission_subvols_cnt;
diff --git a/xlators/cluster/dht/src/dht-layout.c b/xlators/cluster/dht/src/dht-layout.c
index 3ea75b3..15b1838 100644
--- a/xlators/cluster/dht/src/dht-layout.c
+++ b/xlators/cluster/dht/src/dht-layout.c
@@ -545,7 +545,7 @@ dht_layout_anomalies (xlator_t *this, loc_t *loc, dht_layout_t *layout,
char is_virgin = 1;
uint32_t no_space = 0;
- /* This funtion scans through the layout spread of a directory to
+ /* This function scans through the layout spread of a directory to
check if there are any anomalies. Prior to calling this function
the layout entries should be sorted in the ascending order.
diff --git a/xlators/cluster/map/src/map.c b/xlators/cluster/map/src/map.c
index 6150a33..aa2b23c 100644
--- a/xlators/cluster/map/src/map.c
+++ b/xlators/cluster/map/src/map.c
@@ -570,7 +570,7 @@ map_statfs_cbk (call_frame_t *frame,
}
local->op_ret = 0;
- /* when a call is successfull, add it to local->dict */
+ /* when a call is successful, add it to local->dict */
dict_buf = &local->statvfs;
if (dict_buf->f_bsize != 0) {
diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c
index ae8cdb2..750fa88 100644
--- a/xlators/encryption/crypt/src/crypt.c
+++ b/xlators/encryption/crypt/src/crypt.c
@@ -1701,7 +1701,7 @@ static int32_t crypt_ftruncate_finodelk_cbk(call_frame_t *frame,
/*
* ftruncate is performed in 2 steps:
- * . recieve file size;
+ * . receive file size;
* . expand or prune file.
*/
static int32_t crypt_ftruncate(call_frame_t *frame,
diff --git a/xlators/encryption/crypt/src/crypt.h b/xlators/encryption/crypt/src/crypt.h
index 4a87f01..31bb59d 100644
--- a/xlators/encryption/crypt/src/crypt.h
+++ b/xlators/encryption/crypt/src/crypt.h
@@ -253,7 +253,7 @@ typedef struct {
*/
gf_dirent_t *de; /* directory entry */
char *de_path; /* pathname of directory entry */
- uint32_t de_prefix_len; /* lenght of the parent's pathname */
+ uint32_t de_prefix_len; /* length of the parent's pathname */
gf_dirent_t *entries;
uint32_t update_disk_file_size:1;
diff --git a/xlators/encryption/crypt/src/metadata.c b/xlators/encryption/crypt/src/metadata.c
index ebc76c8..a4124ab 100644
--- a/xlators/encryption/crypt/src/metadata.c
+++ b/xlators/encryption/crypt/src/metadata.c
@@ -404,7 +404,7 @@ int32_t check_format_v1(uint32_t len, unsigned char *wire)
* return:
* -1 on errors;
* 0 on failed verification;
- * 1 on sucessful verification
+ * 1 on successful verification
*/
static int32_t verify_link_mac_v1(struct mtd_format_v1 *fmt,
uint32_t idx /* index of the mac to verify */,
diff --git a/xlators/features/changelog/lib/src/gf-history-changelog.c b/xlators/features/changelog/lib/src/gf-history-changelog.c
index 12f51da..9b1da84 100644
--- a/xlators/features/changelog/lib/src/gf-history-changelog.c
+++ b/xlators/features/changelog/lib/src/gf-history-changelog.c
@@ -93,7 +93,7 @@ gf_history_changelog_done (char *file)
/**
* @API
* gf_history_changelog_start_fresh:
- * For a set of changelogs, start from the begining.
+ * For a set of changelogs, start from the beginning.
* It will truncates the history tracker fd.
*
* RETURN VALUES:
@@ -399,7 +399,7 @@ out:
* @value : time stamp to search
* @from : start index to search
* @to : end index to search
- * @len : length of fixes length strings seperated by null
+ * @len : length of fixes length strings separated by null
*/
int
diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h
index 33a99ee..aca2e70 100644
--- a/xlators/features/changelog/src/changelog-helpers.h
+++ b/xlators/features/changelog/src/changelog-helpers.h
@@ -217,6 +217,9 @@ struct changelog_priv {
/* lock to synchronize CSNAP updation */
gf_lock_t c_snap_lock;
+ /* written end of the pipe */
+ int wfd;
+
/* rollover time */
int32_t rollover_time;
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index fa5e533..61e6012 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -43,7 +43,7 @@ add_brick_at_right_order (glusterd_brickinfo_t *brickinfo,
/* The complexity of the function is in deciding at which index
to add new brick. Even though it can be defined with a complex
- single formula for all volume, it is seperated out to make it
+ single formula for all volume, it is separated out to make it
more readable */
if (stripe_cnt) {
/* common formula when 'stripe_count' is set */
diff --git a/xlators/mgmt/glusterd/src/glusterd-messages.h b/xlators/mgmt/glusterd/src/glusterd-messages.h
index b4f8585..7af7390 100644
--- a/xlators/mgmt/glusterd/src/glusterd-messages.h
+++ b/xlators/mgmt/glusterd/src/glusterd-messages.h
@@ -136,14 +136,14 @@
/*!
* @messageid 106011
- * @diagnosis A volume quota-conf version mismatch occured while adding a peer
+ * @diagnosis A volume quota-conf version mismatch occurred while adding a peer
* @recommendedaction None
*/
#define GD_MSG_QUOTA_CONFIG_VERS_MISMATCH (GLUSTERD_COMP_BASE + 11)
/*!
* @messageid 106012
- * @diagnosis A quota-conf checksum mismatch occured while adding a peer
+ * @diagnosis A quota-conf checksum mismatch occurred while adding a peer
* @recommendedaction Check for which node the checksum mismatch happens
* and delete the volume configuration files from it and
* restart glusterd
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index c994d76..3e88a13 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -2010,7 +2010,7 @@ glusterd_op_set_volume (dict_t *dict, char **errstr)
goto out;
}
- // TODO: Remove this once v3.3 compatability is not required
+ /* TODO: Remove this once v3.3 compatibility is not required */
check_op_version = dict_get_str_boolean (dict, "check-op-version",
_gf_false);
diff --git a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c
index 2d555a8..046142b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c
@@ -250,7 +250,7 @@ glusterd_peerinfo_find (uuid_t uuid, const char *hostname)
* values using the passed parameters.
* @hostname is added as the first entry in peerinfo->hostnames list and also
* set to peerinfo->hostname.
- * It returns a pointer to peerinfo object if successfull and returns NULL
+ * It returns a pointer to peerinfo object if successful and returns NULL
* otherwise. The caller should take care of freeing the created peerinfo
* object.
*/
@@ -510,7 +510,7 @@ out:
}
/* gd_add_friend_to_dict() adds details of @friend into @dict with the given
- * @prefix. All the parameters are compulsary.
+ * @prefix. All the parameters are compulsory.
*
* The complete address list is added to the dict only if the cluster op-version
* is >= GD_OP_VERSION_3_6_0
@@ -545,7 +545,7 @@ gd_add_friend_to_dict (glusterd_peerinfo_t *friend, dict_t *dict,
}
/* Setting the first hostname from the list with this key for backward
- * compatability
+ * compatibility
*/
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "%s.hostname", prefix);
@@ -707,7 +707,7 @@ out:
/* gd_update_peerinfo_from_dict will update the hostnames for @peerinfo from
* peer details with @prefix in @dict.
- * Returns 0 on sucess and -1 on failure.
+ * Returns 0 on success and -1 on failure.
*/
int
gd_update_peerinfo_from_dict (glusterd_peerinfo_t *peerinfo, dict_t *dict,
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index 0d66571..5a46410 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -351,7 +351,7 @@ glusterd_rebalance_rpc_create (glusterd_volinfo_t *volinfo,
*/
if (reconnect) {
ret = sys_stat (sockfile, &buf);
- /* TODO: Remove this once we don't need backward compatability
+ /* TODO: Remove this once we don't need backward compatibility
* with the older path
*/
if (ret && (errno == ENOENT)) {
@@ -845,7 +845,7 @@ glusterd_defrag_event_notify_handle (dict_t *dict)
volname = volname_ptr + 1;
} else {
gf_log (this->name, GF_LOG_ERROR,
- "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-snapshot-utils.c b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c
index fb3fad2..f27bb5d 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c
@@ -733,7 +733,7 @@ out:
/* Imports the snapshot details of a brick if required and available
*
- * Snapshot details will be imported only if the cluster op-verison is >= 4
+ * Snapshot details will be imported only if the cluster op-version is >= 4
*/
int
gd_import_new_brick_snap_details (dict_t *dict, char *prefix,
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
index bcee5fb..a596d3e 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
@@ -374,7 +374,7 @@ snap_max_limits_display_commit (dict_t *rsp_dict, char *volname,
opt_hard_max);
if (ret) {
snprintf (err_str, PATH_MAX,
- "Failed to set %s in reponse dictionary",
+ "Failed to set %s in response dictionary",
GLUSTERD_STORE_KEY_SNAP_MAX_HARD_LIMIT);
goto out;
}
@@ -8384,7 +8384,7 @@ glusterd_handle_snapshot_fn (rpcsvc_request_t *req)
}
break;
default:
- gf_log (this->name, GF_LOG_ERROR, "Unkown snapshot request "
+ gf_log (this->name, GF_LOG_ERROR, "Unknown snapshot request "
"type (%d)", type);
ret = -1; /* Failure */
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index c3d651e..ce8bf1b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -3535,7 +3535,7 @@ glusterd_store_retrieve_snap (char *snapname)
goto out;
}
- /* TODO: list_add_order can do 'N-square' comparisions and
+ /* TODO: list_add_order can do 'N-square' comparisons and
is not efficient. Find a better solution to store the snap
in order */
glusterd_list_add_order (&snap->snap_list, &priv->snapshots,
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index 16778ea..affd338 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -1165,10 +1165,10 @@ err:
}
/* This function resolves symbolic link into directory path from
- * the mount and restart the parsing process from the begining
+ * the mount and restart the parsing process from the beginning
*
* Note : Path specified in the symlink should be relative to the
- * symlink, because that is the one which is consistent throught
+ * symlink, because that is the one which is consistent through
* out the file system.
* If the symlink resolves into another symlink ,then same process
* will be repeated.
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 08d3d08..e5b85b4 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -739,7 +739,7 @@ client3_3_reopen_cbk (struct rpc_req *req, struct iovec *iov, int count,
ret = 0;
if (attempt_lock_recovery) {
- /* Delay decrementing the reopen fd count untill all the
+ /* Delay decrementing the reopen fd count until all the
locks corresponding to this fd are acquired.*/
gf_log (this->name, GF_LOG_DEBUG, "acquiring locks "
"on %s", local->loc.path);
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index efbe358..3cc942d 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -5161,7 +5161,7 @@ posix_fill_readdir (fd_t *fd, DIR *dir, off_t off, size_t size,
* .attribute file located at the root of the filesystem
* We hide it to glusterfs clients, since chaos will occur
* when the cluster/dht xlator decides to distribute
- * exended attribute backing file accross storage servers.
+ * exended attribute backing file across storage servers.
*/
if ((uuid_compare (fd->inode->gfid, rootgfid) == 0)
&& (!strcmp(entry->d_name, ".attribute")))