Cluster Project branch, RHEL5, updated. cmirror_1_1_15-50-g1e15a60
adas@sourceware.org
adas@sourceware.org
Wed Apr 16 16:36:00 GMT 2008
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1e15a60fe192ae8ba3fd608db6af777e947c8a5e
The branch, RHEL5 has been updated
via 1e15a60fe192ae8ba3fd608db6af777e947c8a5e (commit)
from 8b95436e966e45031d295348946a9ea3b7e11171 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1e15a60fe192ae8ba3fd608db6af777e947c8a5e
Author: Abhijith Das <adas@redhat.com>
Date: Wed Apr 16 11:24:47 2008 -0500
gfs2_tool: Fix build warnings in misc.c bz 441636
gfs2_tool used to include both linux/fs.h and sys/mount.h that caused some symbols to be defined twice and hence caused some build warnings. This patch removes #include linux/fs.h and moves all the required definitions from there to a new local header file iflags.h.
This patch also removes the SYSTEM and DIRECTIO flags as they are not used anymore.
-----------------------------------------------------------------------
Summary of changes:
gfs2/{mkfs/gfs2_mkfs.h => tool/iflags.h} | 41 +++---------------------------
gfs2/tool/misc.c | 16 +++--------
2 files changed, 9 insertions(+), 48 deletions(-)
copy gfs2/{mkfs/gfs2_mkfs.h => tool/iflags.h} (72%)
diff --git a/gfs2/mkfs/gfs2_mkfs.h b/gfs2/tool/iflags.h
similarity index 72%
copy from gfs2/mkfs/gfs2_mkfs.h
copy to gfs2/tool/iflags.h
index 627c018..c577c4a 100644
--- a/gfs2/mkfs/gfs2_mkfs.h
+++ b/gfs2/tool/iflags.h
@@ -2,7 +2,7 @@
*******************************************************************************
**
** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-** Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+** Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
**
** This copyrighted material is made available to anyone wishing to use,
** modify, copy, or redistribute it subject to the terms and conditions
@@ -11,45 +11,13 @@
*******************************************************************************
******************************************************************************/
-#ifndef __GFS2_MKFS_DOT_H__
-#define __GFS2_MKFS_DOT_H__
-
-#include "linux_endian.h"
-#include <linux/gfs2_ondisk.h>
-#include "osi_list.h"
-#include "copyright.cf"
-#include "ondisk.h"
-
-#define SRANDOM do { srandom(time(NULL) ^ getpid()); } while (0)
-#define RESRANDOM do { srandom(RANDOM(1000000000)); } while (0)
-
-/* main_grow */
-void main_grow(int argc, char *argv[]);
-
-/* main_jadd */
-void main_jadd(int argc, char *argv[]);
-
-/* main_mkfs */
-void main_mkfs(int argc, char *argv[]);
-
-/* main_shrink */
-void main_shrink(int argc, char *argv[]);
-
-/*
- * The following inode IOCTL macros and inode flags
- * are copied from linux/fs.h, because we have duplicate
- * definition of symbols when we include both linux/fs.h and
- * sys/mount.h in our program
- */
+#ifndef __IFLAGS_DOT_H__
+#define __IFLAGS_DOT_H__
#define FS_IOC_GETFLAGS _IOR('f', 1, long)
#define FS_IOC_SETFLAGS _IOW('f', 2, long)
-#define FS_IOC_GETVERSION _IOR('v', 1, long)
-#define FS_IOC_SETVERSION _IOW('v', 2, long)
#define FS_IOC32_GETFLAGS _IOR('f', 1, int)
#define FS_IOC32_SETFLAGS _IOW('f', 2, int)
-#define FS_IOC32_GETVERSION _IOR('v', 1, int)
-#define FS_IOC32_SETVERSION _IOW('v', 2, int)
/*
* Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS)
@@ -82,5 +50,4 @@ void main_shrink(int argc, char *argv[]);
#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
-
-#endif /* __GFS2_MKFS_DOT_H__ */
+#endif /* __IFLAGS_DOT_H__ */
diff --git a/gfs2/tool/misc.c b/gfs2/tool/misc.c
index 1d46e1d..152a9b4 100644
--- a/gfs2/tool/misc.c
+++ b/gfs2/tool/misc.c
@@ -2,7 +2,7 @@
*******************************************************************************
**
** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-** Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+** Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
**
** This copyrighted material is made available to anyone wishing to use,
** modify, copy, or redistribute it subject to the terms and conditions
@@ -29,10 +29,10 @@
#define __user
#include <linux/gfs2_ondisk.h>
#include <sys/mount.h>
-#include <linux/fs.h>
#include "libgfs2.h"
#include "gfs2_tool.h"
+#include "iflags.h"
#if GFS2_TOOL_FEATURE_IMPLEMENTED
/**
@@ -198,16 +198,12 @@ print_flags(struct gfs2_dinode *di)
{
if (di->di_flags) {
printf("Flags:\n");
- if (di->di_flags & GFS2_DIF_SYSTEM)
- printf(" system\n");
if (di->di_flags & GFS2_DIF_JDATA)
printf(" jdata\n");
if (di->di_flags & GFS2_DIF_EXHASH)
printf(" exhash\n");
if (di->di_flags & GFS2_DIF_EA_INDIRECT)
printf(" ea_indirect\n");
- if (di->di_flags & GFS2_DIF_DIRECTIO)
- printf(" directio\n");
if (di->di_flags & GFS2_DIF_IMMUTABLE)
printf(" immutable\n");
if (di->di_flags & GFS2_DIF_APPENDONLY)
@@ -228,12 +224,10 @@ print_flags(struct gfs2_dinode *di)
static unsigned int
get_flag_from_name(char *name)
{
- if (strncmp(name, "system", 6) == 0)
- return GFS2_DIF_SYSTEM;
- else if (strncmp(name, "jdata", 5) == 0)
+ if (strncmp(name, "jdata", 5) == 0)
return FS_JOURNAL_DATA_FL;
- else if (strncmp(name, "directio", 8) == 0)
- return FS_DIRECTIO_FL;
+ else if (strncmp(name, "exhash", 6) == 0)
+ return FS_INDEX_FL;
else if (strncmp(name, "immutable", 9) == 0)
return FS_IMMUTABLE_FL;
else if (strncmp(name, "appendonly", 10) == 0)
hooks/post-receive
--
Cluster Project
More information about the Cluster-cvs
mailing list