From 0773ca67fdb60a142207759fa6c07a69882ce59c Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Tue, 28 Jul 2015 12:11:12 -0400 Subject: 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 Reviewed-on: http://review.gluster.org/11769 Tested-by: NetBSD Build System Reviewed-by: Dan Lambright Reviewed-by: Kaleb KEITHLEY Reviewed-by: Niels de Vos Reviewed-by: Raghavendra Bhat Reviewed-by: Venky Shankar --- xlators/nfs/server/src/auth-cache.c | 2 +- xlators/nfs/server/src/mount3.c | 6 +++--- xlators/nfs/server/src/nfs3-helpers.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'xlators/nfs') diff --git a/xlators/nfs/server/src/auth-cache.c b/xlators/nfs/server/src/auth-cache.c index 2d9af4e8c79..730e0a97d20 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 a243e480fa7..5ac034aa759 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 42f4f68d3b0..2670e60c759 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; -- cgit