summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
Diffstat (limited to 'xlators')
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-algorithm.h2
-rw-r--r--xlators/features/trash/src/trash.c14
-rw-r--r--xlators/performance/io-cache/src/io-cache.c13
-rw-r--r--xlators/performance/io-cache/src/ioc-inode.c12
4 files changed, 21 insertions, 20 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-algorithm.h b/xlators/cluster/afr/src/afr-self-heal-algorithm.h
index 9995ee20bd3..7ef324477e1 100644
--- a/xlators/cluster/afr/src/afr-self-heal-algorithm.h
+++ b/xlators/cluster/afr/src/afr-self-heal-algorithm.h
@@ -29,7 +29,7 @@ struct afr_sh_algorithm {
afr_sh_algo_fn fn;
};
-struct afr_sh_algorithm afr_self_heal_algorithms[3];
+extern struct afr_sh_algorithm afr_self_heal_algorithms[3];
typedef struct {
gf_lock_t lock;
diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c
index 378c579b921..aa5cea0d156 100644
--- a/xlators/features/trash/src/trash.c
+++ b/xlators/features/trash/src/trash.c
@@ -111,7 +111,7 @@ trash_unlink_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
break;
tmp_dirname = strchr (tmp_str + count + 1, '/');
}
- tmp_path = strndup (local->newpath, count);
+ tmp_path = memdup (local->newpath, count);
if (!tmp_path) {
gf_log (this->name, GF_LOG_DEBUG, "out of memory");
}
@@ -154,7 +154,7 @@ trash_unlink_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
break;
tmp_dirname = strchr (tmp_str + count + 1, '/');
}
- tmp_path = strndup (local->newpath, count);
+ tmp_path = memdup (local->newpath, count);
if (!tmp_path) {
gf_log (this->name, GF_LOG_DEBUG, "out of memory");
}
@@ -410,7 +410,7 @@ trash_rename_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
tmp_dirname = strchr (tmp_str + count + 1, '/');
- tmp_path = strndup (local->newpath, count);
+ tmp_path = memdup (local->newpath, count);
if (!tmp_path) {
gf_log (this->name, GF_LOG_DEBUG, "out of memory");
}
@@ -866,7 +866,7 @@ trash_truncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
break;
tmp_dirname = strchr (tmp_str + count + 1, '/');
}
- tmp_path = strndup (local->newpath, count);
+ tmp_path = memdup (local->newpath, count);
if (!tmp_path) {
gf_log (this->name, GF_LOG_DEBUG, "out of memory");
}
@@ -909,7 +909,7 @@ trash_truncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
break;
tmp_dirname = strchr (tmp_str + count + 1, '/');
}
- tmp_path = strndup (local->newpath, count);
+ tmp_path = memdup (local->newpath, count);
if (!tmp_path) {
gf_log (this->name, GF_LOG_DEBUG, "out of memory");
}
@@ -1227,7 +1227,7 @@ trash_ftruncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
break;
tmp_dirname = strchr (tmp_str + count + 1, '/');
}
- tmp_path = strndup (local->newpath, count);
+ tmp_path = memdup (local->newpath, count);
if (!tmp_path) {
gf_log (this->name, GF_LOG_DEBUG, "out of memory");
}
@@ -1271,7 +1271,7 @@ trash_ftruncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
break;
tmp_dirname = strchr (tmp_str + count + 1, '/');
}
- tmp_path = strndup (local->newpath, count);
+ tmp_path = memdup (local->newpath, count);
if (!tmp_path) {
gf_log (this->name, GF_LOG_DEBUG, "out of memory");
}
diff --git a/xlators/performance/io-cache/src/io-cache.c b/xlators/performance/io-cache/src/io-cache.c
index 13811b628b1..60dda3e35a4 100644
--- a/xlators/performance/io-cache/src/io-cache.c
+++ b/xlators/performance/io-cache/src/io-cache.c
@@ -30,7 +30,7 @@
#include <assert.h>
#include <sys/time.h>
-extern int ioc_log2_page_size;
+int ioc_log2_page_size;
uint32_t
ioc_get_priority (ioc_table_t *table, const char *path);
@@ -38,6 +38,17 @@ ioc_get_priority (ioc_table_t *table, const char *path);
uint32_t
ioc_get_priority (ioc_table_t *table, const char *path);
+
+inline uint32_t
+ioc_hashfn (void *data, int len)
+{
+ off_t offset;
+
+ offset = *(off_t *) data;
+
+ return (offset >> ioc_log2_page_size);
+}
+
inline ioc_inode_t *
ioc_inode_reupdate (ioc_inode_t *ioc_inode)
{
diff --git a/xlators/performance/io-cache/src/ioc-inode.c b/xlators/performance/io-cache/src/ioc-inode.c
index 9ac5469f5e3..74c657fe7c3 100644
--- a/xlators/performance/io-cache/src/ioc-inode.c
+++ b/xlators/performance/io-cache/src/ioc-inode.c
@@ -24,17 +24,7 @@
#include "io-cache.h"
-int ioc_log2_page_size;
-
-inline uint32_t
-ioc_hashfn (void *data, int len)
-{
- off_t offset;
-
- offset = *(off_t *) data;
-
- return (offset >> ioc_log2_page_size);
-}
+extern int ioc_log2_page_size;
/*
* str_to_ptr - convert a string to pointer