cluster: STABLE3 - libgfs2: Move SYS_BASE macro

cluster: STABLE3 - libgfs2: Move SYS_BASE macro

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ddc73d79ebec29a68c432feb9f4dedb891fca8c6
Commit:        ddc73d79ebec29a68c432feb9f4dedb891fca8c6
Parent:        765b36a2a8872adc1bd28958e957620bfc4920e9
Author:        Steven Whitehouse <swhiteho@redhat.com>
AuthorDate:    Mon Jan 26 09:31:59 2009 +0000
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Feb 19 10:59:54 2009 +0100

libgfs2: Move SYS_BASE macro

This should not be required... we should look up sysfs in /proc/mounts
to find out whether it exists or not. For now though, I've moved it
out of libgfs2.h into the files where its used.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
 gfs2/libgfs2/libgfs2.h |    1 -
 gfs2/libgfs2/misc.c    |    2 +-
 gfs2/tool/misc.c       |    2 ++
 gfs2/tool/tune.c       |    2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 4d219f4..b4a1c05 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -622,7 +622,6 @@ extern int gfs2_query(int *setonabort, struct gfs2_options *opts,
 	__attribute__((format(printf,3,4)));
 
 /* misc.c */
-#define SYS_BASE "/sys/fs/gfs2"
 
 extern uint32_t compute_heightsize(struct gfs2_sbd *sdp, uint64_t *heightsize,
 				   uint32_t bsize1, int diptrs, int inptrs);
diff --git a/gfs2/libgfs2/misc.c b/gfs2/libgfs2/misc.c
index 6dcbf30..a59ea21 100644
--- a/gfs2/libgfs2/misc.c
+++ b/gfs2/libgfs2/misc.c
@@ -19,7 +19,7 @@
 #include "libgfs2.h"
 
 #define PAGE_SIZE (4096)
-
+#define SYS_BASE "/sys/fs/gfs2" /* FIXME: Look in /proc/mounts to find this */
 static char sysfs_buf[PAGE_SIZE];
 
 uint32_t compute_heightsize(struct gfs2_sbd *sdp, uint64_t *heightsize,
diff --git a/gfs2/tool/misc.c b/gfs2/tool/misc.c
index 672d2d6..c591430 100644
--- a/gfs2/tool/misc.c
+++ b/gfs2/tool/misc.c
@@ -21,6 +21,8 @@
 #include "gfs2_tool.h"
 #include "iflags.h"
 
+#define SYS_BASE "/sys/fs/gfs2" /* FIXME: Look in /proc/mounts to find this */
+
 /**
  * do_freeze - freeze a GFS2 filesystem
  * @argc:
diff --git a/gfs2/tool/tune.c b/gfs2/tool/tune.c
index 48b0e33..c083c97 100644
--- a/gfs2/tool/tune.c
+++ b/gfs2/tool/tune.c
@@ -20,6 +20,8 @@
 
 #define SIZE (65536)
 
+#define SYS_BASE "/sys/fs/gfs2" /* FIXME: Look in /proc/mounts for this */
+
 /**
  * get_tune - print out the current tuneable parameters for a filesystem
  * @argc: