diff options
-rw-r--r-- | libglusterfs/src/common-utils.h | 2 | ||||
-rw-r--r-- | rpc/rpc-transport/rdma/src/rdma.c | 2 | ||||
-rw-r--r-- | xlators/features/changelog/src/changelog-helpers.c | 12 | ||||
-rw-r--r-- | xlators/features/changelog/src/changelog-helpers.h | 12 | ||||
-rw-r--r-- | xlators/features/quota/src/quota.c | 4 | ||||
-rw-r--r-- | xlators/storage/bd/src/bd-helper.c | 2 | ||||
-rw-r--r-- | xlators/storage/bd/src/bd.h | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index 26574a41ad4..8c880a9a3a2 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -625,7 +625,7 @@ gf_skip_header_section (int fd, int header_len); struct iatt; struct _dict; -inline gf_boolean_t +gf_boolean_t dht_is_linkfile (struct iatt *buf, struct _dict *dict); gf_loglevel_t diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c index 930ccbe4110..7fbbb949a1e 100644 --- a/rpc/rpc-transport/rdma/src/rdma.c +++ b/rpc/rpc-transport/rdma/src/rdma.c @@ -3074,7 +3074,7 @@ out: } -inline int32_t +static int32_t gf_rdma_decode_error_msg (gf_rdma_peer_t *peer, gf_rdma_post_t *post, size_t bytes_in_post) { diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c index 91c43a16c86..d37680b3df5 100644 --- a/xlators/features/changelog/src/changelog-helpers.c +++ b/xlators/features/changelog/src/changelog-helpers.c @@ -50,7 +50,7 @@ changelog_thread_cleanup (xlator_t *this, pthread_t thr_id) return; } -inline void * +void * changelog_get_usable_buffer (changelog_local_t *local) { changelog_log_data_t *cld = NULL; @@ -65,7 +65,7 @@ changelog_get_usable_buffer (changelog_local_t *local) return cld->cld_iobuf->ptr; } -inline void +void changelog_set_usable_record_and_length (changelog_local_t *local, size_t len, int xr) { @@ -105,7 +105,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; @@ -237,7 +237,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); @@ -264,7 +264,7 @@ changelog_write_change (changelog_priv_t *priv, char *buffer, size_t len) return changelog_write (priv->changelog_fd, buffer, len); } -inline int +int changelog_handle_change (xlator_t *this, changelog_priv_t *priv, changelog_log_data_t *cld) { @@ -639,7 +639,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) { diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h index 16d60b99bf2..b6bbe7ce42c 100644 --- a/xlators/features/changelog/src/changelog-helpers.h +++ b/xlators/features/changelog/src/changelog-helpers.h @@ -268,9 +268,9 @@ typedef struct { void changelog_thread_cleanup (xlator_t *this, pthread_t thr_id); -inline void * +void * changelog_get_usable_buffer (changelog_local_t *local); -inline void +void changelog_set_usable_record_and_length (changelog_local_t *local, size_t len, int xr); void @@ -290,16 +290,16 @@ int changelog_inject_single_event (xlator_t *this, changelog_priv_t *priv, changelog_log_data_t *cld); -inline size_t +size_t changelog_entry_length (); -inline int +int changelog_write (int fd, char *buffer, size_t len); int changelog_write_change (changelog_priv_t *priv, char *buffer, size_t len); -inline int +int changelog_handle_change (xlator_t *this, changelog_priv_t *priv, changelog_log_data_t *cld); -inline void +void changelog_update (xlator_t *this, changelog_priv_t *priv, changelog_local_t *local, changelog_log_type type); void * diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index 9dcfb74b3fa..4edc8014a4d 100644 --- a/xlators/features/quota/src/quota.c +++ b/xlators/features/quota/src/quota.c @@ -384,7 +384,7 @@ quota_timeout (struct timeval *tv, int32_t timeout) return timed_out; } -inline void +void quota_add_parent (quota_dentry_t *dentry, struct list_head *list) { quota_dentry_t *entry = NULL; @@ -938,7 +938,7 @@ err: return 0; } -inline int +int quota_get_limits (xlator_t *this, dict_t *dict, int64_t *hard_lim, int64_t *soft_lim) { diff --git a/xlators/storage/bd/src/bd-helper.c b/xlators/storage/bd/src/bd-helper.c index 63e26d8a3a6..a4a9424d8d6 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/bd/src/bd.h b/xlators/storage/bd/src/bd.h index f59bc6a09ed..c308c59b903 100644 --- a/xlators/storage/bd/src/bd.h +++ b/xlators/storage/bd/src/bd.h @@ -172,7 +172,7 @@ int bd_clone (bd_local_t *local, bd_priv_t *priv); int bd_merge (bd_priv_t *priv, uuid_t gfid); int bd_get_origin (bd_priv_t *priv, loc_t *loc, fd_t *fd, dict_t *dict); -inline void bd_update_amtime(struct iatt *iatt, int flag); +void bd_update_amtime(struct iatt *iatt, int flag); int bd_snapshot_create (bd_local_t *local, bd_priv_t *priv); int bd_clone (bd_local_t *local, bd_priv_t *priv); int bd_merge (bd_priv_t *priv, uuid_t gfid); |