Signed-off-by: Christoph Hellwig <hch@lst.de>

---
 sheep/farm/farm.c    |    3 ---
 sheep/farm/farm.h    |    2 --
 sheep/group.c        |    2 --
 sheep/object_cache.c |    3 ---
 sheep/ops.c          |    3 ---
 sheep/sheep_priv.h   |    4 ++++
 sheep/simple_store.c |    4 ----
 7 files changed, 4 insertions(+), 17 deletions(-)

Index: sheepdog/sheep/farm/farm.c
===================================================================
--- sheepdog.orig/sheep/farm/farm.c	2012-04-25 18:36:48.548041146 +0200
+++ sheepdog/sheep/farm/farm.c	2012-04-25 18:41:34.816048476 +0200
@@ -21,9 +21,6 @@ char farm_obj_dir[PATH_MAX];
 char farm_dir[PATH_MAX];
 
 static int def_open_flags = O_DIRECT | O_DSYNC | O_RDWR;
-extern char *obj_path;
-extern mode_t def_fmode;
-extern mode_t def_dmode;
 
 static int create_directory(char *p)
 {
Index: sheepdog/sheep/farm/farm.h
===================================================================
--- sheepdog.orig/sheep/farm/farm.h	2012-04-25 18:36:48.548041146 +0200
+++ sheepdog/sheep/farm/farm.h	2012-04-25 18:41:34.816048476 +0200
@@ -47,8 +47,6 @@ struct trunk_entry_incore {
 	struct hlist_node hash;
 };
 
-extern char *obj_path;
-
 /* farm.c */
 extern char farm_dir[PATH_MAX];
 extern char farm_obj_dir[PATH_MAX];
Index: sheepdog/sheep/group.c
===================================================================
--- sheepdog.orig/sheep/group.c	2012-04-25 18:38:58.556044475 +0200
+++ sheepdog/sheep/group.c	2012-04-25 18:41:34.816048476 +0200
@@ -25,8 +25,6 @@
 #include "cluster.h"
 
 static int cdrv_fd;
-extern struct store_driver *sd_store;
-extern char *obj_path;
 
 struct node {
 	struct sd_node ent;
Index: sheepdog/sheep/object_cache.c
===================================================================
--- sheepdog.orig/sheep/object_cache.c	2012-04-25 18:36:48.548041146 +0200
+++ sheepdog/sheep/object_cache.c	2012-04-25 18:41:34.816048476 +0200
@@ -32,9 +32,6 @@
 
 static char cache_dir[PATH_MAX];
 static int def_open_flags = O_RDWR;
-extern mode_t def_fmode;
-extern mode_t def_dmode;
-extern struct store_driver *sd_store;
 
 static pthread_mutex_t hashtable_lock[HASH_SIZE] = { [0 ... HASH_SIZE - 1] = PTHREAD_MUTEX_INITIALIZER };
 static struct hlist_head cache_hashtable[HASH_SIZE];
Index: sheepdog/sheep/ops.c
===================================================================
--- sheepdog.orig/sheep/ops.c	2012-04-25 18:36:54.872041308 +0200
+++ sheepdog/sheep/ops.c	2012-04-25 18:41:34.816048476 +0200
@@ -15,9 +15,6 @@
 #include "strbuf.h"
 #include "trace/trace.h"
 
-extern char *obj_path;
-extern struct store_driver *sd_store;
-
 enum sd_op_type {
 	SD_OP_TYPE_CLUSTER = 1, /* cluster operations */
 	SD_OP_TYPE_LOCAL,       /* local operations */
Index: sheepdog/sheep/sheep_priv.h
===================================================================
--- sheepdog.orig/sheep/sheep_priv.h	2012-04-25 18:36:48.548041146 +0200
+++ sheepdog/sheep/sheep_priv.h	2012-04-25 18:41:34.816048476 +0200
@@ -209,6 +209,10 @@ static inline struct store_driver *find_
 }
 
 extern struct cluster_info *sys;
+extern struct store_driver *sd_store;
+extern char *obj_path;
+extern mode_t def_fmode;
+extern mode_t def_dmode;
 
 int create_listen_port(int port, void *data);
 
Index: sheepdog/sheep/simple_store.c
===================================================================
--- sheepdog.orig/sheep/simple_store.c	2012-04-25 18:36:48.548041146 +0200
+++ sheepdog/sheep/simple_store.c	2012-04-25 18:41:34.816048476 +0200
@@ -26,10 +26,6 @@
 #include "util.h"
 
 
-extern char *obj_path;
-
-extern mode_t def_fmode;
-
 static int def_store_flags = O_DIRECT | O_DSYNC | O_RDWR;
 
 static int simple_store_write(uint64_t oid, struct siocb *iocb);