summaryrefslogtreecommitdiffstats
path: root/xlators/cluster
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/cluster')
-rw-r--r--xlators/cluster/afr/src/afr-common.c2
-rw-r--r--xlators/cluster/afr/src/afr-lk-common.c2
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-metadata.c2
-rw-r--r--xlators/cluster/afr/src/pump.c2
-rw-r--r--xlators/cluster/dht/src/dht-hashfn.c9
-rw-r--r--xlators/cluster/dht/src/dht-helper.c2
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c10
-rw-r--r--xlators/cluster/dht/src/dht-selfheal.c4
-rw-r--r--xlators/cluster/dht/src/tier.c4
-rw-r--r--xlators/cluster/ec/src/ec-data.c2
-rw-r--r--xlators/cluster/stripe/src/stripe.c6
11 files changed, 19 insertions, 26 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index f74d530a7aa..66d04b7c8c5 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -3066,7 +3066,7 @@ afr_parallel_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
return 0;
}
-static inline gf_boolean_t
+static gf_boolean_t
afr_is_conflicting_lock_present (int32_t op_ret, int32_t op_errno)
{
if (op_ret == -1 && op_errno == EAGAIN)
diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c
index 8175a219ced..53bb7920089 100644
--- a/xlators/cluster/afr/src/afr-lk-common.c
+++ b/xlators/cluster/afr/src/afr-lk-common.c
@@ -996,7 +996,7 @@ afr_copy_locked_nodes (call_frame_t *frame, xlator_t *this)
}
-static inline gf_boolean_t
+static gf_boolean_t
afr_is_entrylk (afr_internal_lock_t *int_lock,
afr_transaction_type trans_type)
{
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c
index aea5c2921ef..53133705adc 100644
--- a/xlators/cluster/afr/src/afr-self-heal-metadata.c
+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c
@@ -99,7 +99,7 @@ out:
return ret;
}
-static inline uint64_t
+static uint64_t
mtime_ns(struct iatt *ia)
{
uint64_t ret;
diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c
index 3b2724ad5ec..d68947979e1 100644
--- a/xlators/cluster/afr/src/pump.c
+++ b/xlators/cluster/afr/src/pump.c
@@ -132,7 +132,7 @@ afr_update_loc_gfids (loc_t *loc, struct iatt *buf, struct iatt *postparent)
}
static uint64_t pump_pid = 0;
-static inline void
+static void
pump_fill_loc_info (loc_t *loc, struct iatt *iatt, struct iatt *parent)
{
afr_update_loc_gfids (loc, iatt, parent);
diff --git a/xlators/cluster/dht/src/dht-hashfn.c b/xlators/cluster/dht/src/dht-hashfn.c
index 478d6cea2f5..66e3ede736b 100644
--- a/xlators/cluster/dht/src/dht-hashfn.c
+++ b/xlators/cluster/dht/src/dht-hashfn.c
@@ -39,7 +39,7 @@ dht_hash_compute_internal (int type, const char *name, uint32_t *hash_p)
}
-static inline
+static
gf_boolean_t
dht_munge_name (const char *original, char *modified, size_t len, regex_t *re)
{
@@ -72,13 +72,6 @@ dht_hash_compute (xlator_t *this, int type, const char *name, uint32_t *hash_p)
size_t len = 0;
gf_boolean_t munged = _gf_false;
- /*
- * It wouldn't be safe to use alloca in an inline function that doesn't
- * actually get inlined, and it wouldn't be efficient to do a real
- * allocation, so we use alloca here (if needed) and pass that to the
- * inline.
- */
-
if (priv->extra_regex_valid) {
len = strlen(name) + 1;
rsync_friendly_name = alloca(len);
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
index 7107a085762..7a18559ff11 100644
--- a/xlators/cluster/dht/src/dht-helper.c
+++ b/xlators/cluster/dht/src/dht-helper.c
@@ -25,7 +25,7 @@ dht_free_mig_info (void *data)
return;
}
-static inline int
+static int
dht_inode_ctx_set_mig_info (xlator_t *this, inode_t *inode,
xlator_t *src_subvol, xlator_t *dst_subvol)
{
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 6b3299c4990..3d549b0fb00 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -367,7 +367,7 @@ out:
gf_defrag_handle_hardlink for description of "returning -2")
-1 : failure
*/
-static inline int
+static int
__is_file_migratable (xlator_t *this, loc_t *loc,
struct iatt *stbuf, dict_t *xattrs, int flags,
gf_defrag_info_t *defrag)
@@ -421,7 +421,7 @@ out:
return ret;
}
-static inline int
+static int
__dht_rebalance_create_dst_file (xlator_t *to, xlator_t *from, loc_t *loc, struct iatt *stbuf,
fd_t **dst_fd, dict_t *xattr)
{
@@ -577,7 +577,7 @@ out:
return ret;
}
-static inline int
+static int
__dht_check_free_space (xlator_t *to, xlator_t *from, loc_t *loc,
struct iatt *stbuf, int flag)
{
@@ -687,7 +687,7 @@ out:
return ret;
}
-static inline int
+static int
__dht_rebalance_migrate_data (xlator_t *from, xlator_t *to, fd_t *src, fd_t *dst,
uint64_t ia_size, int hole_exists)
{
@@ -742,7 +742,7 @@ __dht_rebalance_migrate_data (xlator_t *from, xlator_t *to, fd_t *src, fd_t *dst
}
-static inline int
+static int
__dht_rebalance_open_src_file (xlator_t *from, xlator_t *to, loc_t *loc,
struct iatt *stbuf, fd_t **src_fd,
gf_boolean_t *clean_src)
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
index 0e84a38082f..ab15ca6d66d 100644
--- a/xlators/cluster/dht/src/dht-selfheal.c
+++ b/xlators/cluster/dht/src/dht-selfheal.c
@@ -383,7 +383,7 @@ out:
return fixit;
}
-inline int
+int
dht_layout_span (dht_layout_t *layout)
{
int i = 0, count = 0;
@@ -1362,7 +1362,7 @@ dht_selfheal_layout_alloc_start (xlator_t *this, loc_t *loc,
return start;
}
-static inline int
+static int
dht_get_layout_count (xlator_t *this, dht_layout_t *layout, int new_layout)
{
int i = 0;
diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c
index 5d6d7983a3f..d47932df5c0 100644
--- a/xlators/cluster/dht/src/tier.c
+++ b/xlators/cluster/dht/src/tier.c
@@ -546,7 +546,7 @@ out:
return ret;
}
-static inline int
+static int
tier_build_migration_qfile (demotion_args_t *args,
query_cbk_args_t *query_cbk_args,
gf_boolean_t is_promotion)
@@ -597,7 +597,7 @@ out:
return ret;
}
-static inline int
+static int
tier_migrate_files_using_qfile (demotion_args_t *comp,
query_cbk_args_t *query_cbk_args,
char *qfile)
diff --git a/xlators/cluster/ec/src/ec-data.c b/xlators/cluster/ec/src/ec-data.c
index 34c8b6e92c8..721b104245f 100644
--- a/xlators/cluster/ec/src/ec-data.c
+++ b/xlators/cluster/ec/src/ec-data.c
@@ -108,7 +108,7 @@ void ec_cbk_data_destroy(ec_cbk_data_t * cbk)
* heal to complete as healing big file/directory could take a while. Which
* will lead to hang on the mount.
*/
-static inline gf_boolean_t
+static gf_boolean_t
ec_needs_graceful_completion (ec_fop_data_t *fop)
{
if ((fop->id != EC_FOP_HEAL) && (fop->id != EC_FOP_FHEAL))
diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c
index dbb76c30b38..5184ccdb959 100644
--- a/xlators/cluster/stripe/src/stripe.c
+++ b/xlators/cluster/stripe/src/stripe.c
@@ -4464,7 +4464,7 @@ stripe_is_bd (dict_t *this, char *key, data_t *value, void *data)
return 0;
}
-static inline gf_boolean_t
+static gf_boolean_t
stripe_setxattr_is_bd (dict_t *dict)
{
gf_boolean_t is_bd = _gf_false;
@@ -4633,7 +4633,7 @@ out:
return ret;
}
-static inline gf_boolean_t
+static gf_boolean_t
stripe_fsetxattr_is_special (dict_t *dict)
{
gf_boolean_t is_spl = _gf_false;
@@ -5574,7 +5574,7 @@ err:
return 0;
}
-static inline gf_boolean_t
+static gf_boolean_t
stripe_is_special_xattr (const char *name)
{
gf_boolean_t is_spl = _gf_false;
generated by cgit (git 2.34.1) at 2024-04-28 14:27:42 +0000