path: root/xlators/nfs/server
diff options
authorKaleb S KEITHLEY <>2015-11-18 12:28:42 -0500
committerNiels de Vos <>2016-01-18 01:02:34 -0800
commit50ae3e67e4f294925fc840d3f83b77f7072af54d (patch)
treed682399e0b506b09d3106ea69c0518ea6cd8e0d8 /xlators/nfs/server
parentf3e03c9d47b7438a6f124e01e2f459c2b72b1c29 (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. backport of Change-Id: I56a5e614735c9e0a6ee420dab949eac22e25c155,, BUG: 1245331 Change-Id: Iba1efb0bc578ea4a5e9bf76b7bd93dc1be9eba44 BUG: 1283302 Signed-off-by: Kaleb S KEITHLEY <> Reviewed-on: Smoke: Gluster Build System <> NetBSD-regression: NetBSD Build System <> CentOS-regression: Gluster Build System <> Reviewed-by: Niels de Vos <>
Diffstat (limited to 'xlators/nfs/server')
3 files changed, 6 insertions, 6 deletions
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 f2b7cd1151c..1ca76b2e897 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -67,7 +67,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)
@@ -207,7 +207,7 @@ out:
* Not for external use.
-inline void
__mountdict_remove (struct mount3_state *ms, struct mountentry *me)
dict_del (ms->mountdict, me->hashkey);
@@ -1914,7 +1914,7 @@ out:
* a write operation.
-inline 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 f2219d21003..985d08b01eb 100644
--- a/xlators/nfs/server/src/nfs3-helpers.c
+++ b/xlators/nfs/server/src/nfs3-helpers.c
@@ -263,7 +263,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
nfs3_cbk_errno_status (int32_t op_ret, int32_t op_errno)
if ((op_ret == -1) && (op_errno == 0)) {
@@ -3967,7 +3967,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
nfs3_fh_auth_nfsop (nfs3_call_state_t *cs, gf_boolean_t is_write_op)
struct nfs_state *nfs = NULL;