[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-49-g8b95436



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=8b95436e966e45031d295348946a9ea3b7e11171

The branch, RHEL5 has been updated
       via  8b95436e966e45031d295348946a9ea3b7e11171 (commit)
      from  afb6cf25e46a7afc40f97367e26719b29cd0983d (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 8b95436e966e45031d295348946a9ea3b7e11171
Author: Abhijith Das <adas redhat com>
Date:   Wed Apr 16 10:57:22 2008 -0500

    Revert "gfs2_tool: Fix build warnings in misc.c bz 441636"
    
    This reverts commit b0d53e957419d279f5b1846d29160d150f1d02d2.
    This commit broke build in STABLE2 and HEAD branches with upstream code.
    This patch is reverted in STABLE2 and HEAD. Reverting in RHEL5 as well to
    keep all 3 branches in sync. Will push a better fix to this bug shortly.

-----------------------------------------------------------------------

Summary of changes:
 gfs2/tool/misc.c |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/gfs2/tool/misc.c b/gfs2/tool/misc.c
index 555976b..1d46e1d 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/ext3_fs.h>
+#include <linux/fs.h>
 
 #include "libgfs2.h"
 #include "gfs2_tool.h"
@@ -198,12 +198,16 @@ 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)
@@ -224,18 +228,20 @@ print_flags(struct gfs2_dinode *di)
 static unsigned int 
 get_flag_from_name(char *name)
 {
-	if (strncmp(name, "jdata", 5) == 0)
-		return EXT3_JOURNAL_DATA_FL;
-	else if (strncmp(name, "exhash", 6) == 0)
-		return EXT3_INDEX_FL;
+	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;
 	else if (strncmp(name, "immutable", 9) == 0)
-		return EXT3_IMMUTABLE_FL;
+		return FS_IMMUTABLE_FL;
 	else if (strncmp(name, "appendonly", 10) == 0)
-		return EXT3_APPEND_FL;
+		return FS_APPEND_FL;
 	else if (strncmp(name, "noatime", 7) == 0)
-		return EXT3_NOATIME_FL;
+		return FS_NOATIME_FL;
 	else if (strncmp(name, "sync", 4) == 0)
-		return EXT3_SYNC_FL;
+		return FS_SYNC_FL;
 	else 
 		return 0;
 }
@@ -270,13 +276,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, EXT3_IOC_GETFLAGS, &newflags);
+		error = ioctl(fd, FS_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, EXT3_IOC_SETFLAGS, &newflags);
+		error = ioctl(fd, FS_IOC_SETFLAGS, &newflags);
 		if (error)
 			die("can't set flags on %s: %s\n", 
 			    argv[optind], strerror(errno));


hooks/post-receive
--
Cluster Project


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]