diff options
author | Jeff Darcy <jdarcy@redhat.com> | 2015-07-28 12:11:12 -0400 |
---|---|---|
committer | Jeff Darcy <jdarcy@redhat.com> | 2015-09-01 04:55:15 -0700 |
commit | 0773ca67fdb60a142207759fa6c07a69882ce59c (patch) | |
tree | 027101fce644fe17e58c78321b1632f38aaed166 /xlators/features/quota/src/quota.c | |
parent | 038dfe57cf0c5944b0392332dbf5a00bb1208150 (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/features/quota/src/quota.c')
-rw-r--r-- | xlators/features/quota/src/quota.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index 30445c4feaa..1a8aa87a2f6 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) |