From 9bcf83c0a84d7cbb86f4bcd55cc01b0ab7c72250 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Mon, 22 Jun 2015 10:50:13 -0400 Subject: [PATCH] LU-6245 gss: remove libcfs.h from gss utilities code The gss utility code has nearly all the user land headers it needs. No need to include libcfs.h anymore. Change-Id: I2d08d8bf7d4f6165134eb8d445563497db3bf65d Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/15368 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Dmitry Eremin Reviewed-by: Sebastien Buisson Reviewed-by: Oleg Drokin --- lustre/utils/gss/lgss_utils.h | 6 ++---- lustre/utils/gss/lsupport.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lustre/utils/gss/lgss_utils.h b/lustre/utils/gss/lgss_utils.h index 01405e6..eaa30cd 100644 --- a/lustre/utils/gss/lgss_utils.h +++ b/lustre/utils/gss/lgss_utils.h @@ -43,8 +43,6 @@ #include #include -#include - #define LGSS_SVC_MGS_STR "lustre_mgs" #define LGSS_SVC_MDS_STR "lustre_mds" #define LGSS_SVC_OSS_STR "lustre_oss" @@ -102,13 +100,13 @@ void __logmsg_gss(loglevel_t level, const char *func, const gss_OID mech, #define logmsg(loglevel, format, args...) \ do { \ - if (unlikely(loglevel <= g_log_level)) \ + if (loglevel <= g_log_level) \ __logmsg(loglevel, __FUNCTION__, format, ##args); \ } while (0) #define logmsg_gss(loglevel, mech, major, minor, format, args...) \ do { \ - if (unlikely(loglevel <= g_log_level)) \ + if (loglevel <= g_log_level) \ __logmsg_gss(loglevel, __FUNCTION__, mech, \ major, minor, format, ##args); \ } while (0) diff --git a/lustre/utils/gss/lsupport.h b/lustre/utils/gss/lsupport.h index 5a9df50..0745ad1 100644 --- a/lustre/utils/gss/lsupport.h +++ b/lustre/utils/gss/lsupport.h @@ -36,10 +36,10 @@ #ifndef __LSUPPORT_H__ #define __LSUPPORT_H__ +#include #include #include -#include #include #define GSSD_CLI (0) -- 1.8.3.1