This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
Cluster Project branch, RHEL5, updated. cmirror_1_1_15-40-gb0d53e9
- From: adas at sourceware dot org
- To: cluster-cvs at sources dot redhat dot com, cluster-devel at redhat dot com
- Date: 11 Apr 2008 14:23:29 -0000
- Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-40-gb0d53e9
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=b0d53e957419d279f5b1846d29160d150f1d02d2
The branch, RHEL5 has been updated
via b0d53e957419d279f5b1846d29160d150f1d02d2 (commit)
from 73916dd1f4ce1fa237a8e01e682e6380132edeeb (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 b0d53e957419d279f5b1846d29160d150f1d02d2
Author: Abhijith Das <adas@redhat.com>
Date: Fri Apr 11 09:10: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 uses linux/ext3_fs.h instead of /linux/fs.h and uses EXT3_XXX_FL inode flags instead of the respective FS_XXX_FL flags.
This patch also removes the SYSTEM and DIRECTIO flags as they are not used anymore.
-----------------------------------------------------------------------
Summary of changes:
gfs2/tool/misc.c | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/gfs2/tool/misc.c b/gfs2/tool/misc.c
index 1d46e1d..555976b 100644
--- a/gfs2/tool/misc.c
+++ b/gfs2/tool/misc.c
@@ -29,7 +29,7 @@
#define __user
#include <linux/gfs2_ondisk.h>
#include <sys/mount.h>
-#include <linux/fs.h>
+#include <linux/ext3_fs.h>
#include "libgfs2.h"
#include "gfs2_tool.h"
@@ -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,20 +224,18 @@ 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)
- return FS_JOURNAL_DATA_FL;
- else if (strncmp(name, "directio", 8) == 0)
- return FS_DIRECTIO_FL;
+ if (strncmp(name, "jdata", 5) == 0)
+ return EXT3_JOURNAL_DATA_FL;
+ else if (strncmp(name, "exhash", 6) == 0)
+ return EXT3_INDEX_FL;
else if (strncmp(name, "immutable", 9) == 0)
- return FS_IMMUTABLE_FL;
+ return EXT3_IMMUTABLE_FL;
else if (strncmp(name, "appendonly", 10) == 0)
- return FS_APPEND_FL;
+ return EXT3_APPEND_FL;
else if (strncmp(name, "noatime", 7) == 0)
- return FS_NOATIME_FL;
+ return EXT3_NOATIME_FL;
else if (strncmp(name, "sync", 4) == 0)
- return FS_SYNC_FL;
+ return EXT3_SYNC_FL;
else
return 0;
}
@@ -276,13 +270,13 @@ set_flag(int argc, char **argv)
if (fd < 0)
die("can't open %s: %s\n", argv[optind], strerror(errno));
/* first get the existing flags on the file */
- error = ioctl(fd, FS_IOC_GETFLAGS, &newflags);
+ error = ioctl(fd, EXT3_IOC_GETFLAGS, &newflags);
if (error)
die("can't get flags on %s: %s\n",
argv[optind], strerror(errno));
newflags = set ? newflags | flag : newflags & ~flag;
/* new flags */
- error = ioctl(fd, FS_IOC_SETFLAGS, &newflags);
+ error = ioctl(fd, EXT3_IOC_SETFLAGS, &newflags);
if (error)
die("can't set flags on %s: %s\n",
argv[optind], strerror(errno));
hooks/post-receive
--
Cluster Project