summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2015-07-28 12:11:12 -0400
committerJeff Darcy <jdarcy@redhat.com>2015-09-01 04:55:15 -0700
commit0773ca67fdb60a142207759fa6c07a69882ce59c (patch)
tree027101fce644fe17e58c78321b1632f38aaed166 /xlators
parent038dfe57cf0c5944b0392332dbf5a00bb1208150 (diff)
all: reduce "inline" usage
There are three kinds of inline functions: plain inline, extern inline, and static inline. All three have been removed from .c files, except those in "contrib" which aren't our problem. Inlines in .h files, which are overwhelmingly "static inline" already, have generally been left alone. Over time we should be able to "lower" these into .c files, but that has to be done in a case-by-case fashion requiring more manual effort. This part was easy to do automatically without (as far as I can tell) any ill effect. In the process, several pieces of dead code were flagged by the compiler, and were removed. Change-Id: I56a5e614735c9e0a6ee420dab949eac22e25c155 BUG: 1245331 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/11769 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Dan Lambright <dlambrig@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators')
-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
-rw-r--r--xlators/debug/io-stats/src/io-stats.c4
-rw-r--r--xlators/debug/trace/src/trace.c2
-rw-r--r--xlators/encryption/crypt/src/atom.c8
-rw-r--r--xlators/encryption/crypt/src/crypt.c12
-rw-r--r--xlators/features/bit-rot/src/bitd/bit-rot-scrub.c26
-rw-r--r--xlators/features/bit-rot/src/bitd/bit-rot-tbf.c4
-rw-r--r--xlators/features/bit-rot/src/bitd/bit-rot.c36
-rw-r--r--xlators/features/bit-rot/src/stub/bit-rot-stub.c32
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog-reborp.c53
-rw-r--r--xlators/features/changelog/src/changelog-encoders.c2
-rw-r--r--xlators/features/changelog/src/changelog-ev-handle.c6
-rw-r--r--xlators/features/changelog/src/changelog-helpers.c26
-rw-r--r--xlators/features/changelog/src/changelog-rpc.c2
-rw-r--r--xlators/features/changelog/src/changelog.c2
-rw-r--r--xlators/features/changetimerecorder/src/changetimerecorder.c4
-rw-r--r--xlators/features/changetimerecorder/src/ctr-xlator-ctx.c6
-rw-r--r--xlators/features/index/src/index.c4
-rw-r--r--xlators/features/locks/src/entrylk.c4
-rw-r--r--xlators/features/locks/src/inodelk.c12
-rw-r--r--xlators/features/locks/src/reservelk.c2
-rw-r--r--xlators/features/marker/src/marker.c2
-rw-r--r--xlators/features/quota/src/quota.c18
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-hooks.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-server-quorum.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-snapshot.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-store.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.c2
-rw-r--r--xlators/mount/fuse/src/fuse-bridge.c2
-rw-r--r--xlators/mount/fuse/src/fuse-resolve.c2
-rw-r--r--xlators/nfs/server/src/auth-cache.c2
-rw-r--r--xlators/nfs/server/src/mount3.c6
-rw-r--r--xlators/nfs/server/src/nfs3-helpers.c4
-rw-r--r--xlators/performance/io-cache/src/io-cache.c8
-rw-r--r--xlators/storage/bd/src/bd-helper.c2
-rw-r--r--xlators/storage/posix/src/posix.c2
48 files changed, 146 insertions, 214 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index f74d530..66d04b7 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 8175a21..53bb792 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 aea5c29..5313370 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 3b2724a..d689479 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 478d6ce..66e3ede 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 7107a08..7a18559 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 6b3299c..3d549b0 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 0e84a38..ab15ca6 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 5d6d798..d47932d 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 34c8b6e..721b104 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 dbb76c3..5184ccd 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;
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index be47202..68a2dfc 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -150,7 +150,7 @@ struct ios_local {
struct volume_options options[];
-inline static int
+static int
is_fop_latency_started (call_frame_t *frame)
{
GF_ASSERT (frame);
@@ -510,7 +510,7 @@ out:
return 0;
}
-static inline int
+static int
ios_stats_cleanup (xlator_t *this, inode_t *inode)
{
diff --git a/xlators/debug/trace/src/trace.c b/xlators/debug/trace/src/trace.c
index 94d32a7..5bbd07a 100644
--- a/xlators/debug/trace/src/trace.c
+++ b/xlators/debug/trace/src/trace.c
@@ -19,7 +19,7 @@
*/
#define TRACE_STAT_TO_STR(buf, str) trace_stat_to_str (buf, str, sizeof (str))
-static inline void
+static void
trace_stat_to_str(struct iatt *buf, char *str, size_t len)
{
char atime_buf[256] = {0,};
diff --git a/xlators/encryption/crypt/src/atom.c b/xlators/encryption/crypt/src/atom.c
index 9b2d79c..3fa1220 100644
--- a/xlators/encryption/crypt/src/atom.c
+++ b/xlators/encryption/crypt/src/atom.c
@@ -846,7 +846,7 @@ static struct iovec *get_iovec_hole_full(call_frame_t *frame,
return conf->avec + (conf->off_in_head ? 1 : 0);
}
-static inline struct iovec *get_iovec_hole_tail(call_frame_t *frame,
+static struct iovec *get_iovec_hole_tail(call_frame_t *frame,
uint32_t count)
{
struct avec_config *conf = get_hole_conf(frame);
@@ -854,7 +854,7 @@ static inline struct iovec *get_iovec_hole_tail(call_frame_t *frame,
return conf->avec + (conf->blocks_in_pool - 1);
}
-static inline struct iovec *get_iovec_data_head(call_frame_t *frame,
+static struct iovec *get_iovec_data_head(call_frame_t *frame,
uint32_t count)
{
struct avec_config *conf = get_data_conf(frame);
@@ -862,7 +862,7 @@ static inline struct iovec *get_iovec_data_head(call_frame_t *frame,
return conf->avec;
}
-static inline struct iovec *get_iovec_data_full(call_frame_t *frame,
+static struct iovec *get_iovec_data_full(call_frame_t *frame,
uint32_t count)
{
struct avec_config *conf = get_data_conf(frame);
@@ -870,7 +870,7 @@ static inline struct iovec *get_iovec_data_full(call_frame_t *frame,
return conf->avec + (conf->off_in_head ? 1 : 0) + count;
}
-static inline struct iovec *get_iovec_data_tail(call_frame_t *frame,
+static struct iovec *get_iovec_data_tail(call_frame_t *frame,
uint32_t count)
{
struct avec_config *conf = get_data_conf(frame);
diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c
index 8c2b43c..000a870 100644
--- a/xlators/encryption/crypt/src/crypt.c
+++ b/xlators/encryption/crypt/src/crypt.c
@@ -688,13 +688,13 @@ void set_local_io_params_ftruncate(call_frame_t *frame,
}
}
-static inline void submit_head(call_frame_t *frame, xlator_t *this)
+static void submit_head(call_frame_t *frame, xlator_t *this)
{
crypt_local_t *local = frame->local;
submit_partial(frame, this, local->fd, HEAD_ATOM);
}
-static inline void submit_tail(call_frame_t *frame, xlator_t *this)
+static void submit_tail(call_frame_t *frame, xlator_t *this)
{
crypt_local_t *local = frame->local;
submit_partial(frame, this, local->fd, TAIL_ATOM);
@@ -725,14 +725,14 @@ static void submit_data(call_frame_t *frame, xlator_t *this)
* heplers called by writev_cbk, fruncate_cbk in ordered mode
*/
-static inline int32_t should_submit_hole(crypt_local_t *local)
+static int32_t should_submit_hole(crypt_local_t *local)
{
struct avec_config *conf = &local->hole_conf;
return conf->avec != NULL;
}
-static inline int32_t should_resume_submit_hole(crypt_local_t *local)
+static int32_t should_resume_submit_hole(crypt_local_t *local)
{
struct avec_config *conf = &local->hole_conf;
@@ -749,7 +749,7 @@ static inline int32_t should_resume_submit_hole(crypt_local_t *local)
return conf->cursor < conf->acount;
}
-static inline int32_t should_resume_submit_data(call_frame_t *frame)
+static int32_t should_resume_submit_data(call_frame_t *frame)
{
crypt_local_t *local = frame->local;
struct avec_config *conf = &local->data_conf;
@@ -762,7 +762,7 @@ static inline int32_t should_resume_submit_data(call_frame_t *frame)
return 0;
}
-static inline int32_t should_submit_data_after_hole(crypt_local_t *local)
+static int32_t should_submit_data_after_hole(crypt_local_t *local)
{
return local->data_conf.avec != NULL;
}
diff --git a/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c
index c5f44b5..4a74bbf 100644
--- a/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c
+++ b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c
@@ -43,7 +43,7 @@ struct br_fsscan_entry {
* NOTE: On success @xattr is not unref'd as @sign points
* to the dictionary value.
*/
-static inline int32_t
+static int32_t
bitd_fetch_signature (xlator_t *this, br_child_t *child,
fd_t *fd, dict_t **xattr, br_isignature_out_t **sign)
{
@@ -131,7 +131,7 @@ bitd_scrub_post_compute_check (xlator_t *this,
}
-static inline int32_t
+static int32_t
bitd_signature_staleness (xlator_t *this,
br_child_t *child, fd_t *fd,
int *stale, unsigned long *version)
@@ -191,7 +191,7 @@ bitd_scrub_pre_compute_check (xlator_t *this, br_child_t *child,
return ret;
}
-/* static inline int */
+/* static int */
int
bitd_compare_ckum (xlator_t *this,
br_isignature_out_t *sign,
@@ -429,13 +429,13 @@ wait_for_scrubbing (xlator_t *this, struct br_scanfs *fsscan)
pthread_cleanup_pop (0);
}
-static inline void
+static void
_br_fsscan_inc_entry_count (struct br_scanfs *fsscan)
{
fsscan->entries++;
}
-static inline void
+static void
_br_fsscan_dec_entry_count (struct br_scanfs *fsscan)
{
if (--fsscan->entries == 0) {
@@ -554,7 +554,7 @@ br_fsscan_deactivate (xlator_t *this, br_child_t *child)
return 0;
}
-static inline void
+static void
br_fsscanner_log_time (xlator_t *this, br_child_t *child, const char *sfx)
{
struct timeval tv = {0,};
@@ -589,7 +589,7 @@ br_fsscanner_wait_until_kicked (struct br_scanfs *fsscan)
pthread_cleanup_pop (0);
}
-static inline void
+static void
br_fsscanner_entry_control (xlator_t *this, br_child_t *child)
{
struct br_scanfs *fsscan = &child->fsscan;
@@ -603,7 +603,7 @@ br_fsscanner_entry_control (xlator_t *this, br_child_t *child)
UNLOCK (&child->lock);
}
-static inline void
+static void
br_fsscanner_exit_control (xlator_t *this, br_child_t *child)
{
struct br_scanfs *fsscan = &child->fsscan;
@@ -690,7 +690,7 @@ br_kickstart_scanner (struct gf_tw_timer_list *timer,
}
-static inline uint32_t
+static uint32_t
br_fsscan_calculate_delta (uint32_t times)
{
return times;
@@ -905,7 +905,7 @@ br_scrubber_calc_scale (xlator_t *this,
}
-static inline br_child_t *
+static br_child_t *
_br_scrubber_get_next_child (struct br_scrubber *fsscrub)
{
br_child_t *child = NULL;
@@ -916,7 +916,7 @@ _br_scrubber_get_next_child (struct br_scrubber *fsscrub)
return child;
}
-static inline void
+static void
_br_scrubber_get_entry (br_child_t *child, struct br_fsscan_entry **fsentry)
{
struct br_scanfs *fsscan = &child->fsscan;
@@ -928,7 +928,7 @@ _br_scrubber_get_entry (br_child_t *child, struct br_fsscan_entry **fsentry)
list_del_init (&(*fsentry)->list);
}
-static inline void
+static void
_br_scrubber_find_scrubbable_entry (struct br_scrubber *fsscrub,
struct br_fsscan_entry **fsentry)
{
@@ -1159,7 +1159,7 @@ br_scrubber_configure (xlator_t *this, br_private_t *priv,
return ret;
}
-static inline int32_t
+static int32_t
br_scrubber_fetch_option (xlator_t *this,
char *opt, dict_t *options, char **value)
{
diff --git a/xlators/features/bit-rot/src/bitd/bit-rot-tbf.c b/xlators/features/bit-rot/src/bitd/bit-rot-tbf.c
index d954341..f8b9b75 100644
--- a/xlators/features/bit-rot/src/bitd/bit-rot-tbf.c
+++ b/xlators/features/bit-rot/src/bitd/bit-rot-tbf.c
@@ -55,7 +55,7 @@ typedef struct br_tbf_throttle {
*/
#define BR_TBF_TOKENGEN_INTERVAL_USEC 600000
-static inline br_tbf_throttle_t *
+static br_tbf_throttle_t *
br_tbf_init_throttle (unsigned long tokens_required)
{
br_tbf_throttle_t *throttle = NULL;
@@ -137,7 +137,7 @@ void *br_tbf_tokengenerator (void *arg)
* under br_tbf_mod() context) and br_tbf_throttle(). *bucket is
* updated _after_ all the required variables are initialized.
*/
-static inline int32_t
+static int32_t
br_tbf_init_bucket (br_tbf_t *tbf, br_tbf_opspec_t *spec)
{
int ret = 0;
diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c
index d987466..d6ae5e2 100644
--- a/xlators/features/bit-rot/src/bitd/bit-rot.c
+++ b/xlators/features/bit-rot/src/bitd/bit-rot.c
@@ -118,7 +118,7 @@ br_brick_fini (void *xl, char *brick, void *data)
* FIX: Send the string length as part of the signature struct and
* change stub to handle this change.
*/
-static inline br_isignature_t *
+static br_isignature_t *
br_prepare_signature (const unsigned char *sign,
unsigned long hashlen,
int8_t hashtype, br_object_t *object)
@@ -181,7 +181,7 @@ out:
/**
* Do a lookup on the gfid present within the object.
*/
-static inline int32_t
+static int32_t
br_object_lookup (xlator_t *this, br_object_t *object,
struct iatt *iatt, inode_t **linked_inode)
{
@@ -229,7 +229,7 @@ out:
* know that open is being done by bitd because syncop framework does not allow
* passing xdata -- may be use frame->root->pid itself.
*/
-static inline int32_t
+static int32_t
br_object_open (xlator_t *this,
br_object_t *object, inode_t *inode, fd_t **openfd)
{
@@ -372,14 +372,14 @@ br_calculate_obj_checksum (unsigned char *md,
return ret;
}
-static inline int32_t
+static int32_t
br_object_checksum (unsigned char *md,
br_object_t *object, fd_t *fd, struct iatt *iatt)
{
return br_calculate_obj_checksum (md, object->child, fd, iatt);
}
-static inline int32_t
+static int32_t
br_object_read_sign (inode_t *linked_inode, fd_t *fd, br_object_t *object,
struct iatt *iatt)
{
@@ -452,7 +452,7 @@ br_object_read_sign (inode_t *linked_inode, fd_t *fd, br_object_t *object,
return ret;
}
-static inline int br_object_sign_softerror (int32_t op_errno)
+static int br_object_sign_softerror (int32_t op_errno)
{
return ((op_errno == ENOENT) || (op_errno == ESTALE)
|| (op_errno == ENODATA));
@@ -562,7 +562,7 @@ br_object_resign (xlator_t *this,
* some form of priority scheduling and/or read burstness to avoid starving
* (or kicking) client I/O's.
*/
-static inline int32_t br_sign_object (br_object_t *object)
+static int32_t br_sign_object (br_object_t *object)
{
int32_t ret = -1;
inode_t *linked_inode = NULL;
@@ -631,7 +631,7 @@ static inline int32_t br_sign_object (br_object_t *object)
return ret;
}
-static inline br_object_t *__br_pick_object (br_private_t *priv)
+static br_object_t *__br_pick_object (br_private_t *priv)
{
br_object_t *object = NULL;
@@ -719,7 +719,7 @@ br_add_object_to_queue (struct gf_tw_timer_list *timer,
return;
}
-static inline br_object_t *
+static br_object_t *
br_initialize_object (xlator_t *this, br_child_t *child, changelog_event_t *ev)
{
br_object_t *object = NULL;
@@ -741,7 +741,7 @@ out:
return object;
}
-static inline struct gf_tw_timer_list *
+static struct gf_tw_timer_list *
br_initialize_timer (xlator_t *this, br_object_t *object, br_child_t *child,
changelog_event_t *ev)
{
@@ -872,17 +872,7 @@ br_fill_brick_spec (struct gf_brick_spec *brick, char *path)
brick->disconnected = NULL;
}
-static inline gf_boolean_t
-br_time_equal (br_child_t *child, struct timeval *tv)
-{
- if ((child->tv.tv_sec == tv->tv_sec) &&
- (child->tv.tv_usec == tv->tv_usec))
- return _gf_true;
-
- return _gf_false;
-}
-
-static inline gf_boolean_t
+static gf_boolean_t
br_check_object_need_sign (xlator_t *this, dict_t *xattr, br_child_t *child)
{
int32_t ret = -1;
@@ -1641,7 +1631,7 @@ notify (xlator_t *this, int32_t event, void *data, ...)
* Initialize signer specific structures, spawn worker threads.
*/
-static inline void
+static void
br_fini_signer (xlator_t *this, br_private_t *priv)
{
int i = 0;
@@ -1653,7 +1643,7 @@ br_fini_signer (xlator_t *this, br_private_t *priv)
pthread_cond_destroy (&priv->object_cond);
}
-static inline int32_t
+static int32_t
br_init_signer (xlator_t *this, br_private_t *priv)
{
int i = 0;
diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.c b/xlators/features/bit-rot/src/stub/bit-rot-stub.c
index 9439f0c..85fad69 100644
--- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c
+++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c
@@ -148,7 +148,7 @@ fini (xlator_t *this)
return;
}
-static inline int
+static int
br_stub_alloc_versions (br_version_t **obuf,
br_signature_t **sbuf, size_t signaturelen)
{
@@ -178,13 +178,13 @@ br_stub_alloc_versions (br_version_t **obuf,
return -1;
}
-static inline void
+static void
br_stub_dealloc_versions (void *mem)
{
GF_FREE (mem);
}
-static inline br_stub_local_t *
+static br_stub_local_t *
br_stub_alloc_local (xlator_t *this)
{
br_stub_private_t *priv = this->private;
@@ -192,13 +192,13 @@ br_stub_alloc_local (xlator_t *this)
return mem_get0 (priv->local_pool);
}
-static inline void
+static void
br_stub_dealloc_local (br_stub_local_t *ptr)
{
mem_put (ptr);
}
-static inline int
+static int
br_stub_prepare_version_request (xlator_t *this, dict_t *dict,
br_version_t *obuf, unsigned long oversion)
{
@@ -211,7 +211,7 @@ br_stub_prepare_version_request (xlator_t *this, dict_t *dict,
(void *)obuf, sizeof (br_version_t));
}
-static inline int
+static int
br_stub_prepare_signing_request (dict_t *dict,
br_signature_t *sbuf,
br_isignature_t *sign, size_t signaturelen)
@@ -230,7 +230,7 @@ br_stub_prepare_signing_request (dict_t *dict,
* context, hence the inode is marked dirty. this routine also
* initializes the transient inode version.
*/
-static inline int
+static int
br_stub_init_inode_versions (xlator_t *this, fd_t *fd, inode_t *inode,
unsigned long version, gf_boolean_t markdirty,
gf_boolean_t bad_object)
@@ -271,7 +271,7 @@ free_ctx:
/**
* modify the ongoing version of an inode.
*/
-static inline int
+static int
br_stub_mod_inode_versions (xlator_t *this,
fd_t *fd, inode_t *inode, unsigned long version)
{
@@ -296,7 +296,7 @@ unblock:
return ret;
}
-static inline void
+static void
br_stub_fill_local (br_stub_local_t *local,
call_stub_t *stub, fd_t *fd, inode_t *inode, uuid_t gfid,
int versioningtype, unsigned long memversion)
@@ -311,7 +311,7 @@ br_stub_fill_local (br_stub_local_t *local,
gf_uuid_copy (local->u.context.gfid, gfid);
}
-static inline void
+static void
br_stub_cleanup_local (br_stub_local_t *local)
{
local->fopstub = NULL;
@@ -597,7 +597,7 @@ br_stub_fd_versioning (xlator_t *this, call_frame_t *frame,
return ret;
}
-static inline int
+static int
br_stub_perform_incversioning (xlator_t *this,
call_frame_t *frame, call_stub_t *stub,
fd_t *fd, br_stub_inode_ctx_t *ctx)
@@ -703,7 +703,7 @@ orderq (struct list_head *elem1, struct list_head *elem2)
return (s1->v > s2->v);
}
-static inline int
+static int
br_stub_compare_sign_version (xlator_t *this,
inode_t *inode,
br_signature_t *sbuf,
@@ -753,7 +753,7 @@ br_stub_compare_sign_version (xlator_t *this,
return ret;
}
-static inline int
+static int
br_stub_prepare_signature (xlator_t *this,
dict_t *dict, inode_t *inode,
br_isignature_t *sign, int *fakesuccess)
@@ -1447,7 +1447,7 @@ br_stub_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
return 0;
}
-static inline void
+static void
br_stub_send_stub_init_time (call_frame_t *frame, xlator_t *this)
{
int op_ret = 0;
@@ -2268,7 +2268,7 @@ unwind:
* successfully allocate the dict? Posix does not treat call back xdata
* creattion failure as the lookup failure.
*/
-static inline int32_t
+static int32_t
br_stub_lookup_version (xlator_t *this,
uuid_t gfid, inode_t *inode, dict_t *xattr)
{
@@ -2571,7 +2571,7 @@ br_stub_noop (call_frame_t *frame, void *cookie, xlator_t *this,
return 0;
}
-static inline void
+static void
br_stub_send_ipc_fop (xlator_t *this, fd_t *fd, unsigned long releaseversion,
int sign_info)
{
diff --git a/xlators/features/changelog/lib/src/gf-changelog-reborp.c b/xlators/features/changelog/lib/src/gf-changelog-reborp.c
index e6bb19e3..665a6d0 100644
--- a/xlators/features/changelog/lib/src/gf-changelog-reborp.c
+++ b/xlators/features/changelog/lib/src/gf-changelog-reborp.c
@@ -93,55 +93,6 @@ gf_changelog_connection_janitor (void *arg)
return NULL;
}
-static inline void
-__gf_changelog_set_conn_state (gf_changelog_t *entry,
- gf_changelog_conn_state_t state)
-{
- entry->connstate = state;
-}
-
-/**
- * state check login to gaurd access object after free
- */
-static inline void
-gf_changelog_check_event (gf_private_t *priv,
- gf_changelog_t *entry, rpcsvc_event_t event)
-{
- gf_boolean_t needfree = _gf_false;
- gf_changelog_conn_state_t laststate;
- /**
- * need to handle couple of connection states to gaurd correct
- * freeing of object.
- */
- LOCK (&entry->statelock);
- {
- laststate = entry->connstate;
- if (event == RPCSVC_EVENT_ACCEPT) {
- __gf_changelog_set_conn_state
- (entry, GF_CHANGELOG_CONN_STATE_ACCEPTED);
-
- if (laststate == GF_CHANGELOG_CONN_STATE_DISCONNECTED)
- needfree = _gf_true;
- }
-
- if (event == RPCSVC_EVENT_DISCONNECT) {
- __gf_changelog_set_conn_state
- (entry, GF_CHANGELOG_CONN_STATE_DISCONNECTED);
-
- if (laststate == GF_CHANGELOG_CONN_STATE_ACCEPTED)
- needfree = _gf_true;
- }
- }
- UNLOCK (&entry->statelock);
-
- /**
- * TODO:
- * Handle the race between ACCEPT and DISCONNECT in the
- * reconnect code. So purging of entry is deliberately
- * avoided here. It will be handled in the reconnect code.
- */
-}
-
int
gf_changelog_reborp_rpcsvc_notify (rpcsvc_t *rpc, void *mydata,
rpcsvc_event_t event, void *data)
@@ -181,8 +132,6 @@ gf_changelog_reborp_rpcsvc_notify (rpcsvc_t *rpc, void *mydata,
break;
}
- /* gf_changelog_check_event (priv, entry, event); */
-
return 0;
}
@@ -238,7 +187,7 @@ gf_changelog_invoke_callback (gf_changelog_t *entry,
* dynamically allocated and ordered.
*/
-inline int
+int
__is_expected_sequence (struct gf_event_list *ev, struct gf_event *event)
{
return (ev->next_seq == event->seq);
diff --git a/xlators/features/changelog/src/changelog-encoders.c b/xlators/features/changelog/src/changelog-encoders.c
index 2808b65..9503023 100644
--- a/xlators/features/changelog/src/changelog-encoders.c
+++ b/xlators/features/changelog/src/changelog-encoders.c
@@ -128,7 +128,7 @@ del_entry_free_fn (void *data)
* try to write all data in one shot
*/
-static inline void
+static void
changelog_encode_write_xtra (changelog_log_data_t *cld,
char *buffer, size_t *off, gf_boolean_t encode)
{
diff --git a/xlators/features/changelog/src/changelog-ev-handle.c b/xlators/features/changelog/src/changelog-ev-handle.c
index 5167b56..79652a9 100644
--- a/xlators/features/changelog/src/changelog-ev-handle.c
+++ b/xlators/features/changelog/src/changelog-ev-handle.c
@@ -42,7 +42,7 @@ changelog_event_dispatch_cbk (struct rpc_req *req,
}
/* dispatcher RPC */
-inline int
+int
changelog_dispatch_vec (call_frame_t *frame, xlator_t *this,
struct rpc_clnt *rpc, struct ev_rpc_vec *vec)
{
@@ -243,7 +243,7 @@ changelog_ev_cleanup_connections (xlator_t *this, changelog_clnt_t *c_clnt)
* a performance bottleneck.
*/
-static inline changelog_rpc_clnt_t *
+static changelog_rpc_clnt_t *
get_client (changelog_clnt_t *c_clnt, struct list_head **next)
{
changelog_rpc_clnt_t *crpc = NULL;
@@ -262,7 +262,7 @@ get_client (changelog_clnt_t *c_clnt, struct list_head **next)
return crpc;
}
-static inline void
+static void
put_client (changelog_clnt_t *c_clnt, changelog_rpc_clnt_t *crpc)
{
LOCK (&c_clnt->active_lock);
diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c
index d67be6f..6ca77e9 100644
--- a/xlators/features/changelog/src/changelog-helpers.c
+++ b/xlators/features/changelog/src/changelog-helpers.c
@@ -58,7 +58,7 @@ changelog_thread_cleanup (xlator_t *this, pthread_t thr_id)
return ret;
}
-inline void *
+void *
changelog_get_usable_buffer (changelog_local_t *local)
{
changelog_log_data_t *cld = NULL;
@@ -73,7 +73,7 @@ changelog_get_usable_buffer (changelog_local_t *local)
return cld->cld_iobuf->ptr;
}
-static inline int
+static int
changelog_selector_index (unsigned int selector)
{
return (ffs (selector) - 1);
@@ -183,7 +183,7 @@ changelog_cleanup_event_selection (xlator_t *this,
return LOCK_DESTROY (&selection->reflock);
}
-static inline void
+static void
changelog_perform_dispatch (xlator_t *this,
changelog_priv_t *priv, void *mem, size_t size)
{
@@ -215,7 +215,7 @@ changelog_dispatch_event (xlator_t *this,
}
}
-inline void
+void
changelog_set_usable_record_and_length (changelog_local_t *local,
size_t len, int xr)
{
@@ -255,7 +255,7 @@ changelog_local_cleanup (xlator_t *xl, changelog_local_t *local)
mem_put (local);
}
-inline int
+int
changelog_write (int fd, char *buffer, size_t len)
{
ssize_t size = 0;
@@ -965,7 +965,7 @@ changelog_start_next_change (xlator_t *this,
/**
* return the length of entry
*/
-inline size_t
+size_t
changelog_entry_length ()
{
return sizeof (changelog_log_data_t);
@@ -1054,7 +1054,7 @@ out:
return ret;
}
-inline int
+int
changelog_handle_change (xlator_t *this,
changelog_priv_t *priv, changelog_log_data_t *cld)
{
@@ -1615,7 +1615,7 @@ changelog_inode_ctx_get (xlator_t *this,
* then there is no need to record an update (as the equality of the two version
* signifies an update was recorded in the current time slice).
*/
-inline void
+void
changelog_update (xlator_t *this, changelog_priv_t *priv,
changelog_local_t *local, changelog_log_type type)
{
@@ -1683,7 +1683,7 @@ changelog_update (xlator_t *this, changelog_priv_t *priv,
* not incremented fop count but color is assigned black.
*/
-inline void
+void
changelog_color_fop_and_inc_cnt (xlator_t *this, changelog_priv_t *priv,
changelog_local_t *local)
{
@@ -1699,7 +1699,7 @@ changelog_color_fop_and_inc_cnt (xlator_t *this, changelog_priv_t *priv,
}
/* Increments the respective fop counter based on the fop color */
-inline void
+void
changelog_inc_fop_cnt (xlator_t *this, changelog_priv_t *priv,
changelog_local_t *local)
{
@@ -1729,7 +1729,7 @@ changelog_inc_fop_cnt (xlator_t *this, changelog_priv_t *priv,
}
/* Decrements the respective fop counter based on the fop color */
-inline void
+void
changelog_dec_fop_cnt (xlator_t *this, changelog_priv_t *priv,
changelog_local_t *local)
{
@@ -1781,7 +1781,7 @@ changelog_dec_fop_cnt (xlator_t *this, changelog_priv_t *priv,
/* Write to a pipe setup between changelog main thread and changelog
* rollover thread to initiate explicit rollover of changelog journal.
*/
-inline int
+int
changelog_barrier_notify (changelog_priv_t *priv, char *buf)
{
int ret = 0;
@@ -1793,7 +1793,7 @@ changelog_barrier_notify (changelog_priv_t *priv, char *buf)
}
/* Clean up flags set on barrier notification */
-inline void
+void
changelog_barrier_cleanup (xlator_t *this, changelog_priv_t *priv,
struct list_head *queue)
{
diff --git a/xlators/features/changelog/src/changelog-rpc.c b/xlators/features/changelog/src/changelog-rpc.c
index 76052a2..b07030e 100644
--- a/xlators/features/changelog/src/changelog-rpc.c
+++ b/xlators/features/changelog/src/changelog-rpc.c
@@ -187,7 +187,7 @@ changelog_rpc_clnt_cleanup (changelog_rpc_clnt_t *crpc)
GF_FREE (crpc);
}
-static inline changelog_rpc_clnt_t *
+static changelog_rpc_clnt_t *
changelog_rpc_clnt_init (xlator_t *this,
changelog_probe_req *rpc_req, changelog_clnt_t *c_clnt)
{
diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c
index acd0d42..29e37a7 100644
--- a/xlators/features/changelog/src/changelog.c
+++ b/xlators/features/changelog/src/changelog.c
@@ -2351,7 +2351,7 @@ changelog_barrier_pthread_init (xlator_t *this, changelog_priv_t *priv)
}
/* Destroy barrier related condition variables and locks */
-static inline void
+static void
changelog_barrier_pthread_destroy (changelog_priv_t *priv)
{
pthread_mutex_destroy (&priv->bn.bnotify_mutex);
diff --git a/xlators/features/changetimerecorder/src/changetimerecorder.c b/xlators/features/changetimerecorder/src/changetimerecorder.c
index 7fd6258..5df9cb9 100644
--- a/xlators/features/changetimerecorder/src/changetimerecorder.c
+++ b/xlators/features/changetimerecorder/src/changetimerecorder.c
@@ -79,7 +79,7 @@ What is pending:
/* This function doesnot write anything to the db,
* just created the local variable
* for the frame and sets values for the ctr_db_record */
-static inline int
+static int
ctr_lookup_wind(call_frame_t *frame,
xlator_t *this,
gf_ctr_inode_context_t *ctr_inode_cx)
@@ -154,7 +154,7 @@ out:
/* This function inserts the ctr_db_record populated by ctr_lookup_wind
* in to the db. It also destroys the frame->local created by ctr_lookup_wind */
-static inline int
+static int
ctr_lookup_unwind (call_frame_t *frame,
xlator_t *this)
{
diff --git a/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c
index b5a54c0..c5900ea 100644
--- a/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c
+++ b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c
@@ -17,7 +17,7 @@
(ctr_hard_link->list.next == ctr_hard_link->list.prev)
-static inline void
+static void
fini_ctr_hard_link (ctr_hard_link_t **ctr_hard_link) {
GF_ASSERT (ctr_hard_link);
@@ -246,7 +246,7 @@ out:
/* Delete all hardlinks */
-static inline int
+static int
ctr_delete_all_hard_link (xlator_t *this,
ctr_xlator_ctx_t *ctr_xlator_ctx)
{
@@ -277,7 +277,7 @@ ctr_delete_all_hard_link (xlator_t *this,
/* Please lock the inode before using this function */
-static inline ctr_xlator_ctx_t *
+static ctr_xlator_ctx_t *
__get_ctr_xlator_ctx (xlator_t *this,
inode_t *inode)
{
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 03e1075..2bba663 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -27,7 +27,7 @@ __index_dequeue (struct list_head *callstubs)
return stub;
}
-inline static void
+static void
__index_enqueue (struct list_head *callstubs, call_stub_t *stub)
{
list_add_tail (&stub->list, callstubs);
@@ -539,7 +539,7 @@ xattrop_index_action (xlator_t *this, inode_t *inode, dict_t *xattr,
return;
}
-static inline gf_boolean_t
+static gf_boolean_t
index_xattrop_track (xlator_t *this, gf_xattrop_flags_t flags, dict_t *dict)
{
index_priv_t *priv = this->private;
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c
index 701121b..31553c1 100644
--- a/xlators/features/locks/src/entrylk.c
+++ b/xlators/features/locks/src/entrylk.c
@@ -93,7 +93,7 @@ names_conflict (const char *n1, const char *n2)
}
-static inline int
+static int
__same_entrylk_owner (pl_entry_lock_t *l1, pl_entry_lock_t *l2)
{
return (is_same_lkowner (&l1->owner, &l2->owner) &&
@@ -101,7 +101,7 @@ __same_entrylk_owner (pl_entry_lock_t *l1, pl_entry_lock_t *l2)
}
/* Just as in inodelk, allow conflicting name locks from same (lk_owner, conn)*/
-static inline int
+static int
__conflicting_entrylks (pl_entry_lock_t *l1, pl_entry_lock_t *l2)
{
if (names_conflict (l1->basename, l2->basename)
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c
index df882f5..1564f26 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -18,19 +18,19 @@
#include "locks.h"
#include "common.h"
-inline void
+void
__delete_inode_lock (pl_inode_lock_t *lock)
{
list_del_init (&lock->list);
}
-static inline void
+static void
__pl_inodelk_ref (pl_inode_lock_t *lock)
{
lock->ref++;
}
-inline void
+void
__pl_inodelk_unref (pl_inode_lock_t *lock)
{
lock->ref--;
@@ -41,7 +41,7 @@ __pl_inodelk_unref (pl_inode_lock_t *lock)
}
/* Check if 2 inodelks are conflicting on type. Only 2 shared locks don't conflict */
-static inline int
+static int
inodelk_type_conflict (pl_inode_lock_t *l1, pl_inode_lock_t *l2)
{
if (l2->fl_type == F_WRLCK || l1->fl_type == F_WRLCK)
@@ -115,7 +115,7 @@ inodelk_overlap (pl_inode_lock_t *l1, pl_inode_lock_t *l2)
}
/* Returns true if the 2 inodelks have the same owner */
-static inline int
+static int
same_inodelk_owner (pl_inode_lock_t *l1, pl_inode_lock_t *l2)
{
return (is_same_lkowner (&l1->owner, &l2->owner) &&
@@ -826,7 +826,7 @@ pl_finodelk (call_frame_t *frame, xlator_t *this,
}
-static inline int32_t
+static int32_t
__get_inodelk_dom_count (pl_dom_list_t *dom)
{
pl_inode_lock_t *lock = NULL;
diff --git a/xlators/features/locks/src/reservelk.c b/xlators/features/locks/src/reservelk.c
index b0a858f..8eb08d0 100644
--- a/xlators/features/locks/src/reservelk.c
+++ b/xlators/features/locks/src/reservelk.c
@@ -66,7 +66,7 @@ out:
return ret_lock;
}
-static inline int
+static int
__same_owner_reservelk (posix_lock_t *l1, posix_lock_t *l2)
{
return (is_same_lkowner (&l1->owner, &l2->owner));
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index 2ebbde2..401feb9 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -2259,7 +2259,7 @@ out:
return ret;
}
-static inline gf_boolean_t
+static gf_boolean_t
marker_xattr_cleanup_cmd (dict_t *dict)
{
return (dict_get (dict, VIRTUAL_QUOTA_XATTR_CLEANUP_KEY) != NULL);
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
index 30445c4..1a8aa87 100644
--- a/xlators/features/quota/src/quota.c
+++ b/xlators/features/quota/src/quota.c
@@ -185,7 +185,7 @@ out:
}
-static inline quota_local_t *
+static quota_local_t *
quota_local_new ()
{
quota_local_t *local = NULL;
@@ -268,7 +268,7 @@ quota_dentry_del (quota_inode_ctx_t *ctx, const char *name, uuid_t par)
UNLOCK (&ctx->lock);
}
-static inline inode_t*
+static inode_t*
__quota_inode_parent (inode_t *inode, uuid_t pargfid, const char *name)
{
inode_t *parent = NULL;
@@ -278,7 +278,7 @@ __quota_inode_parent (inode_t *inode, uuid_t pargfid, const char *name)
return parent;
}
-static inline inode_t*
+static inode_t*
quota_inode_parent (inode_t *inode, uuid_t pargfid, const char *name)
{
inode_t *parent = NULL;
@@ -509,7 +509,7 @@ out:
inode_unref (cur_inode);
}
-static inline void
+static void
quota_link_count_decrement (call_frame_t *frame)
{
call_frame_t *tmpframe = NULL;
@@ -553,7 +553,7 @@ out:
return;
}
-static inline void
+static void
quota_handle_validate_error (call_frame_t *frame, int32_t op_ret,
int32_t op_errno)
{
@@ -649,7 +649,7 @@ unwind:
}
-static inline uint64_t
+static uint64_t
quota_time_elapsed (struct timeval *now, struct timeval *then)
{
return (now->tv_sec - then->tv_sec);
@@ -674,7 +674,7 @@ quota_timeout (struct timeval *tv, int32_t timeout)
/* Return: 1 if new entry added
* 0 no entry added
*/
-static inline int32_t
+static int32_t
quota_add_parent (struct list_head *list, char *name, uuid_t pgfid)
{
quota_dentry_t *entry = NULL;
@@ -706,7 +706,7 @@ out:
* context and add unique parent to the list
* Returns number of dentry added to the list
*/
-static inline int32_t
+static int32_t
quota_add_parents_from_ctx (quota_inode_ctx_t *ctx, struct list_head *list)
{
int ret = 0;
@@ -1407,7 +1407,7 @@ out:
return parent;
}
-static inline int
+static int
quota_get_limits (xlator_t *this, dict_t *dict, int64_t *hard_lim,
int64_t *soft_lim, int64_t *object_hard_limit,
int64_t *object_soft_limit)
diff --git a/xlators/mgmt/glusterd/src/glusterd-hooks.c b/xlators/mgmt/glusterd/src/glusterd-hooks.c
index 48a9bc4..4db5460 100644
--- a/xlators/mgmt/glusterd/src/glusterd-hooks.c
+++ b/xlators/mgmt/glusterd/src/glusterd-hooks.c
@@ -59,7 +59,7 @@ char glusterd_hook_dirnames[GD_OP_MAX][256] =
};
#undef EMPTY
-static inline gf_boolean_t
+static gf_boolean_t
glusterd_is_hook_enabled (char *script)
{
return (script[0] == 'S' && (fnmatch ("*.rpmsave", script, 0) != 0)
diff --git a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c
index 61623f4..9f60362 100644
--- a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c
+++ b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c
@@ -176,7 +176,7 @@ out:
return reconfigured;
}
-static inline gf_boolean_t
+static gf_boolean_t
_is_contributing_to_quorum (gd_quorum_contrib_t contrib)
{
if ((contrib == QUORUM_UP) || (contrib == QUORUM_DOWN))
@@ -184,7 +184,7 @@ _is_contributing_to_quorum (gd_quorum_contrib_t contrib)
return _gf_false;
}
-static inline gf_boolean_t
+static gf_boolean_t
_does_quorum_meet (int active_count, int quorum_count)
{
return (active_count >= quorum_count);
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
index 2aef462..e9a98ea 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
@@ -8991,7 +8991,7 @@ glusterd_handle_snapshot (rpcsvc_request_t *req)
return glusterd_big_locked_handler (req, glusterd_handle_snapshot_fn);
}
-static inline void
+static void
glusterd_free_snap_op (glusterd_snap_op_t *snap_op)
{
if (snap_op) {
@@ -9002,7 +9002,7 @@ glusterd_free_snap_op (glusterd_snap_op_t *snap_op)
}
}
-static inline void
+static void
glusterd_free_missed_snapinfo (glusterd_missed_snap_info *missed_snapinfo)
{
glusterd_snap_op_t *snap_opinfo = NULL;
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 1eb789e..37d7d14 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2875,7 +2875,7 @@ out:
return volinfo;
}
-static inline void
+static void
glusterd_store_set_options_path (glusterd_conf_t *conf, char *path, size_t len)
{
snprintf (path, len, "%s/options", conf->workdir);
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 26a7ffa..3491cb1 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -4715,7 +4715,7 @@ glusterd_calc_dist_leaf_count (int rcount, int scount)
return (rcount ? rcount : 1) * (scount ? scount : 1);
}
-inline int
+int
glusterd_get_dist_leaf_count (glusterd_volinfo_t *volinfo)
{
int rcount = volinfo->replica_count;
@@ -5567,7 +5567,7 @@ out:
return ret;
}
-inline int
+int
glusterd_rb_check_bricks (glusterd_volinfo_t *volinfo,
glusterd_brickinfo_t *src, glusterd_brickinfo_t *dst)
{
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 59bc063..38cc609 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -243,7 +243,7 @@ xlator_get_option (xlator_t *xl, char *key, char **value)
return dict_get_str (xl->options, key, value);
}
-static inline xlator_t *
+static xlator_t *
first_of (volgen_graph_t *graph)
{
return (xlator_t *)graph->graph.first;
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index 95f346c..ab507d4 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -364,7 +364,7 @@ out:
}
-static inline int32_t
+static int32_t
glusterd_program_register (xlator_t *this, rpcsvc_t *svc,
rpcsvc_program_t *prog)
{
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index 12d1104..fd07f5f 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -591,7 +591,7 @@ fuse_lookup (xlator_t *this, fuse_in_header_t *finh, void *msg)
return;
}
-static inline void
+static void
do_forget(xlator_t *this, uint64_t unique, uint64_t nodeid, uint64_t nlookup)
{
inode_t *fuse_inode = fuse_ino_to_inode(nodeid, this);
diff --git a/xlators/mount/fuse/src/fuse-resolve.c b/xlators/mount/fuse/src/fuse-resolve.c
index 48ebf53..7e9014c 100644
--- a/xlators/mount/fuse/src/fuse-resolve.c
+++ b/xlators/mount/fuse/src/fuse-resolve.c
@@ -393,7 +393,7 @@ out:
}
-static inline int
+static int
fuse_migrate_fd_error (xlator_t *this, fd_t *fd)
{
fuse_fd_ctx_t *fdctx = NULL;
diff --git a/xlators/nfs/server/src/auth-cache.c b/xlators/nfs/server/src/auth-cache.c
index 2d9af4e..730e0a9 100644
--- a/xlators/nfs/server/src/auth-cache.c
+++ b/xlators/nfs/server/src/auth-cache.c
@@ -184,7 +184,7 @@ out:
*
* @return: true when the auth_cache_entry is expired, false otherwise.
*/
-static inline int
+static int
_auth_cache_expired (struct auth_cache *cache, struct auth_cache_entry *entry)
{
return ((time (NULL) - entry->timestamp) > cache->ttl_sec);
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index a243e48..5ac034a 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -62,7 +62,7 @@ typedef ssize_t (*mnt3_serializer) (struct iovec outmsg, void *args);
extern void *
mount3udp_thread (void *argv);
-static inline void
+static void
mnt3_export_free (struct mnt3_export *exp)
{
if (!exp)
@@ -202,7 +202,7 @@ out:
*
* Not for external use.
*/
-inline void
+void
__mountdict_remove (struct mount3_state *ms, struct mountentry *me)
{
dict_del (ms->mountdict, me->hashkey);
@@ -1890,7 +1890,7 @@ out:
* a write operation.
*
*/
-inline int
+int
mnt3_check_cached_fh (struct mount3_state *ms, struct nfs3_fh *fh,
const char *host_addr, gf_boolean_t is_write_op)
{
diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c
index 42f4f68..2670e60 100644
--- a/xlators/nfs/server/src/nfs3-helpers.c
+++ b/xlators/nfs/server/src/nfs3-helpers.c
@@ -258,7 +258,7 @@ nfs3_errno_to_nfsstat3 (int errnum)
* 0 which means something came wrong from upper layer(s). If it
* happens by any means, then set NFS3 status to NFS3ERR_SERVERFAULT.
*/
-inline nfsstat3
+nfsstat3
nfs3_cbk_errno_status (int32_t op_ret, int32_t op_errno)
{
if ((op_ret == -1) && (op_errno == 0)) {
@@ -3936,7 +3936,7 @@ __nfs3_fh_auth_get_peer (const rpcsvc_request_t *req, char *peer)
* -EACCES for completely unauthorized fop
* -EROFS for unauthorized write operations (rm, mkdir, write)
*/
-inline int
+int
nfs3_fh_auth_nfsop (nfs3_call_state_t *cs, gf_boolean_t is_write_op)
{
struct nfs_state *nfs = NULL;
diff --git a/xlators/performance/io-cache/src/io-cache.c b/xlators/performance/io-cache/src/io-cache.c
index ec6fa08..46e26bc 100644
--- a/xlators/performance/io-cache/src/io-cache.c
+++ b/xlators/performance/io-cache/src/io-cache.c
@@ -26,7 +26,7 @@ ioc_get_priority (ioc_table_t *table, const char *path);
struct volume_options options[];
-static inline uint32_t
+static uint32_t
ioc_hashfn (void *data, int len)
{
off_t offset;
@@ -39,7 +39,7 @@ ioc_hashfn (void *data, int len)
/* TODO: This function is not used, uncomment when we find a
usage for this function.
-static inline ioc_inode_t *
+static ioc_inode_t *
ioc_inode_reupdate (ioc_inode_t *ioc_inode)
{
ioc_table_t *table = NULL;
@@ -53,7 +53,7 @@ ioc_inode_reupdate (ioc_inode_t *ioc_inode)
}
-static inline ioc_inode_t *
+static ioc_inode_t *
ioc_get_inode (dict_t *dict, char *name)
{
ioc_inode_t *ioc_inode = NULL;
@@ -494,7 +494,7 @@ out:
return ret;
}
-static inline uint32_t
+static uint32_t
is_match (const char *path, const char *pattern)
{
int32_t ret = 0;
diff --git a/xlators/storage/bd/src/bd-helper.c b/xlators/storage/bd/src/bd-helper.c
index cf50ba5..9532ad3 100644
--- a/xlators/storage/bd/src/bd-helper.c
+++ b/xlators/storage/bd/src/bd-helper.c
@@ -565,7 +565,7 @@ out:
return ret;
}
-inline void
+void
bd_update_amtime(struct iatt *iatt, int flag)
{
struct timespec ts = {0, };
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 9789a1c..2f5f2d9 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -3231,7 +3231,7 @@ _handle_setxattr_keyvalue_pair (dict_t *d, char *k, data_t *v,
}
#ifdef GF_DARWIN_HOST_OS
-static inline int
+static int
map_xattr_flags(int flags)
{
/* DARWIN has different defines on XATTR_ flags.