From 2c124b5256bac5830d81552bfb4412620aa6cfb0 Mon Sep 17 00:00:00 2001 From: Sanju Rakonde Date: Mon, 25 Sep 2017 17:29:25 +0530 Subject: stack.h:PW.INCLUDE_RECURSION The headerfile globals.h is recursively adding itself. ( globals.h -> xlator.h -> stack.h -> globals.h). We are finding the source files which are including the header file globals.h and removing the inclusion line. I used git grep -l stack.h | xargs git grep globals.h -- to find out the files and removed the header file from all files except libglusterfs/src/xlator.h and libglusterfs/src/Makefile.am When I try to remove header file from libglusterfs/src/xlator.h I'm getting some errors. In libglusterfs/src/Makefile.am it is required for building RPMs. Change-Id: I537218c09ade6d7ea51717768b26563a247daf60 BUG: 789278 Signed-off-by: Sanju Rakonde --- cli/src/cli.c | 1 - glusterfsd/src/glusterfsd.c | 1 - libglusterfs/src/common-utils.c | 1 - libglusterfs/src/stack.h | 1 - xlators/features/quota/src/quota.h | 1 - 5 files changed, 5 deletions(-) diff --git a/cli/src/cli.c b/cli/src/cli.c index 18ca5c82dd0..224db546043 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -55,7 +55,6 @@ #include "revision.h" #include "common-utils.h" #include "event.h" -#include "globals.h" #include "syscall.h" #include "call-stub.h" #include diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index fc902ed0484..fbbfca00d27 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -66,7 +66,6 @@ #include "revision.h" #include "common-utils.h" #include "event.h" -#include "globals.h" #include "statedump.h" #include "latency.h" #include "glusterfsd-mem-types.h" diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c index 327c1fa13db..c90856cca33 100644 --- a/libglusterfs/src/common-utils.c +++ b/libglusterfs/src/common-utils.c @@ -46,7 +46,6 @@ #include "revision.h" #include "glusterfs.h" #include "stack.h" -#include "globals.h" #include "lkowner.h" #include "syscall.h" #include "cli1-xdr.h" diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/stack.h index 249b6d2c54f..ddad46c9673 100644 --- a/libglusterfs/src/stack.h +++ b/libglusterfs/src/stack.h @@ -29,7 +29,6 @@ typedef struct call_pool call_pool_t; #include "dict.h" #include "list.h" #include "common-utils.h" -#include "globals.h" #include "lkowner.h" #include "client_t.h" #include "libglusterfs-messages.h" diff --git a/xlators/features/quota/src/quota.h b/xlators/features/quota/src/quota.h index 79afb28cfe8..adab7eb629c 100644 --- a/xlators/features/quota/src/quota.h +++ b/xlators/features/quota/src/quota.h @@ -21,7 +21,6 @@ #include "dict.h" #include "stack.h" #include "event.h" -#include "globals.h" #include "rpcsvc.h" #include "rpc-clnt.h" #include "byte-order.h" -- cgit