rpms/gfs2-utils/F-8 gfs2-tempondisk.patch, 1.1, 1.2 gfs2-utils.spec, 1.21, 1.22
Chris Feist (cfeist)
fedora-extras-commits at redhat.com
Tue Apr 8 21:38:34 UTC 2008
- Previous message (by thread): rpms/lua-posix/F-7 lua-posix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/gfa/devel gfa.desktop,1.1,1.2 gfa.spec,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cfeist
Update of /cvs/pkgs/rpms/gfs2-utils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6068
Modified Files:
gfs2-tempondisk.patch gfs2-utils.spec
Log Message:
Added proper gfs2_ondisk.h
gfs2-tempondisk.patch:
Index: gfs2-tempondisk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-8/gfs2-tempondisk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gfs2-tempondisk.patch 22 Aug 2006 19:04:20 -0000 1.1
+++ gfs2-tempondisk.patch 8 Apr 2008 21:38:22 -0000 1.2
@@ -1,6 +1,6 @@
---- gfs2-0.1.4/include/gfs2_ondisk.h.tempondisk 2006-08-22 13:51:02.000000000 -0500
-+++ gfs2-0.1.4/include/gfs2_ondisk.h 2006-08-22 13:51:02.000000000 -0500
-@@ -0,0 +1,443 @@
+--- /dev/null 2008-04-07 15:17:33.098001762 -0500
++++ gfs2-0.1.25.2.02.01/include/gfs2_ondisk.h 2008-04-08 16:35:39.000000000 -0500
+@@ -0,0 +1,445 @@
+/*
+ * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
@@ -57,13 +57,6 @@
+ __be64 no_addr;
+};
+
-+static inline int gfs2_inum_equal(const struct gfs2_inum *ino1,
-+ const struct gfs2_inum *ino2)
-+{
-+ return ino1->no_formal_ino == ino2->no_formal_ino &&
-+ ino1->no_addr == ino2->no_addr;
-+}
-+
+/*
+ * Generic metadata head structure
+ * Every inplace buffer logged in the journal must start with this.
@@ -180,6 +173,33 @@
+};
+
+/*
++ * quota linked list: user quotas and group quotas form two separate
++ * singly linked lists. ll_next stores uids or gids of next quotas in the
++ * linked list.
++
++Given the uid/gid, how to calculate the quota file offsets for the corresponding
++gfs2_quota structures on disk:
++
++for user quotas, given uid,
++offset = uid * sizeof(struct gfs2_quota);
++
++for group quotas, given gid,
++offset = (gid * sizeof(struct gfs2_quota)) + sizeof(struct gfs2_quota);
++
++
++ uid:0 gid:0 uid:12 gid:12 uid:17 gid:17 uid:5142 gid:5142
+++-------+-------+ +-------+-------+ +-------+- - - -+ +- - - -+-------+
++| valid | valid | :: | valid | valid | :: | valid | inval | :: | inval | valid |
+++-------+-------+ +-------+-------+ +-------+- - - -+ +- - - -+-------+
++next:12 next:12 next:17 next:5142 next:NULL next:NULL
++ | | | | |<-- user quota list |
++ \______|___________/ \______|___________/ group quota list -->|
++ | | |
++ \__________________/ \_______________________________________/
++
++*/
++
++/*
+ * quota structure
+ */
+
@@ -187,7 +207,8 @@
+ __be64 qu_limit;
+ __be64 qu_warn;
+ __be64 qu_value;
-+ __u8 qu_reserved[64];
++ __be32 qu_ll_next; /* location of next quota in list */
++ __u8 qu_reserved[60];
+};
+
+/*
@@ -269,8 +290,11 @@
+ struct gfs2_inum __pad4; /* Unused even in current gfs1 */
+
+ __be64 di_eattr; /* extended attribute block number */
++ __be32 di_atime_nsec; /* nsec portion of atime */
++ __be32 di_mtime_nsec; /* nsec portion of mtime */
++ __be32 di_ctime_nsec; /* nsec portion of ctime */
+
-+ __u8 di_reserved[56];
++ __u8 di_reserved[44];
+};
+
+/*
@@ -413,34 +437,12 @@
+ __be32 qc_id;
+};
+
-+#ifdef __KERNEL__
-+/* Translation functions */
-+
-+extern void gfs2_inum_in(struct gfs2_inum *no, char *buf);
-+extern void gfs2_inum_out(const struct gfs2_inum *no, char *buf);
-+extern void gfs2_sb_in(struct gfs2_sb *sb, char *buf);
-+extern void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf);
-+extern void gfs2_rindex_out(struct gfs2_rindex *ri, char *buf);
-+extern void gfs2_rgrp_in(struct gfs2_rgrp *rg, char *buf);
-+extern void gfs2_rgrp_out(struct gfs2_rgrp *rg, char *buf);
-+extern void gfs2_quota_in(struct gfs2_quota *qu, char *buf);
-+extern void gfs2_quota_out(struct gfs2_quota *qu, char *buf);
-+extern void gfs2_dinode_in(struct gfs2_dinode *di, char *buf);
-+extern void gfs2_dinode_out(struct gfs2_dinode *di, char *buf);
-+extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, char *buf);
-+extern void gfs2_ea_header_out(struct gfs2_ea_header *ea, char *buf);
-+extern void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf);
-+extern void gfs2_inum_range_in(struct gfs2_inum_range *ir, char *buf);
-+extern void gfs2_inum_range_out(struct gfs2_inum_range *ir, char *buf);
-+extern void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, char *buf);
-+extern void gfs2_statfs_change_out(struct gfs2_statfs_change *sc, char *buf);
-+extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf);
-+
-+/* Printing functions */
-+
-+extern void gfs2_rindex_print(struct gfs2_rindex *ri);
-+extern void gfs2_dinode_print(struct gfs2_dinode *di);
-+
-+#endif /* __KERNEL__ */
++struct gfs2_quota_lvb {
++ __be32 qb_magic;
++ __u32 __pad;
++ __be64 qb_limit; /* Hard limit of # blocks to alloc */
++ __be64 qb_warn; /* Warn user when alloc is above this # */
++ __be64 qb_value; /* Current # blocks allocated */
++};
+
+#endif /* __GFS2_ONDISK_DOT_H__ */
Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-8/gfs2-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gfs2-utils.spec 14 Mar 2008 21:05:50 -0000 1.21
+++ gfs2-utils.spec 8 Apr 2008 21:38:22 -0000 1.22
@@ -11,8 +11,8 @@
###############################################################################
Name: gfs2-utils
-Version: 0.1.25.2.02.00
-Release: 1%{?dist}
+Version: 0.1.25.2.02.01
+Release: 2%{?dist}
License: GPL
Group: System Environment/Kernel
Summary: Utilities for managing the global filesystem (GFS)
@@ -37,7 +37,7 @@
%prep
%setup -q -n gfs2-%{version}
-%patch1 -p2 -b .norun
+%patch1 -p1 -b .norun
%patch2 -p1 -b .tempondisk
%build
@@ -45,8 +45,9 @@
sed -i '/RELEASE_MAJOR/s/= .*/= 0/' make/defines.mk
sed -i '/RELEASE_MINOR/s/= .*/= 1.0/' make/defines.mk
sed -i '/RELEASE /s/= .*/= %{version}/' make/defines.mk
+cd gfs2
mkdir include/linux
-cp include/gfs2_ondisk.h include/linux/
+cp ../include/gfs2_ondisk.h include/linux/
make
%post
@@ -73,7 +74,7 @@
%{_mandir}/*/*
%changelog
-* Fri Mar 14 2008 Chris Feist <cfeist at redhat.com> 0.1.25.2.02.00-1
+* Fri Mar 14 2008 Chris Feist <cfeist at redhat.com> 0.1.25.2.02.00-2
- New upstream sources.
* Tue Jan 16 2007 Chris Feist <cfeist at redhat.com> 0.1.24-1
- Previous message (by thread): rpms/lua-posix/F-7 lua-posix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/gfa/devel gfa.desktop,1.1,1.2 gfa.spec,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list