[Cluster-devel] cluster/gfs2/libgfs2 fs_bits.c libgfs2.h ondis ...

[Cluster-devel] cluster/gfs2/libgfs2 fs_bits.c libgfs2.h ondis ...

[rpeterso]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rpeterso at sourceware.org	2006-06-14 13:55:12

Modified files:
	gfs2/libgfs2   : fs_bits.c libgfs2.h ondisk.c ondisk.h 
	                 structures.c 

Log message:
	Remove obsolete references to unlinked_tag.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/fs_bits.c.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/libgfs2.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/ondisk.c.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/ondisk.h.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/structures.c.diff?cvsroot=cluster&r1=1.4&r2=1.5

--- cluster/gfs2/libgfs2/fs_bits.c	2006/06/08 20:51:24	1.1
+++ cluster/gfs2/libgfs2/fs_bits.c	2006/06/14 13:55:11	1.2
@@ -83,7 +83,7 @@
 				return block - start;
 			}
 			break;
-		case GFS2_BLKST_INVALID:
+		case GFS2_BLKST_UNLINKED:
 		default:
 			break;
 		}
--- cluster/gfs2/libgfs2/libgfs2.h	2006/06/12 20:38:27	1.4
+++ cluster/gfs2/libgfs2/libgfs2.h	2006/06/14 13:55:11	1.5
@@ -131,7 +131,6 @@
 	struct gfs2_inode *statfs;
 	struct gfs2_statfs_change statfs_change;
 	struct gfs2_inode *unlinked;
-	struct gfs2_unlinked_tag unlinked_tag;
 	struct gfs2_inode *quota;
 	struct gfs2_quota_change quota_change;
 };
--- cluster/gfs2/libgfs2/ondisk.c	2006/06/12 20:38:27	1.4
+++ cluster/gfs2/libgfs2/ondisk.c	2006/06/14 13:55:11	1.5
@@ -600,29 +600,6 @@
 	pv(sc, sc_dinodes, "%lld", "0x%llx");
 }
 
-void gfs2_unlinked_tag_in(struct gfs2_unlinked_tag *ut, char *buf)
-{
-	struct gfs2_unlinked_tag *str = (struct gfs2_unlinked_tag *)buf;
-
-	gfs2_inum_in(&ut->ut_inum, buf);
-	CPIN_32(ut, str, ut_flags);
-}
-
-void gfs2_unlinked_tag_out(struct gfs2_unlinked_tag *ut, char *buf)
-{
-	struct gfs2_unlinked_tag *str = (struct gfs2_unlinked_tag *)buf;
-
-	gfs2_inum_out(&ut->ut_inum, buf);
-	CPOUT_32(ut, str, ut_flags);
-	str->__pad = 0;
-}
-
-void gfs2_unlinked_tag_print(struct gfs2_unlinked_tag *ut)
-{
-	gfs2_inum_print(&ut->ut_inum);
-	pv(ut, ut_flags, "%u", "0x%x");
-}
-
 void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf)
 {
 	struct gfs2_quota_change *str = (struct gfs2_quota_change *)buf;
--- cluster/gfs2/libgfs2/ondisk.h	2006/04/27 19:25:46	1.1
+++ cluster/gfs2/libgfs2/ondisk.h	2006/06/14 13:55:11	1.2
@@ -39,8 +39,6 @@
 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_unlinked_tag_in(struct gfs2_unlinked_tag *ut, char *buf);
-extern void gfs2_unlinked_tag_out(struct gfs2_unlinked_tag *ut, char *buf);
 extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf);
 extern void gfs2_quota_change_out(struct gfs2_quota_change *qc, char *buf);
 
@@ -60,7 +58,9 @@
 extern void gfs2_log_descriptor_print(struct gfs2_log_descriptor *ld);
 extern void gfs2_inum_range_print(struct gfs2_inum_range *ir);
 extern void gfs2_statfs_change_print(struct gfs2_statfs_change *sc);
+#if 0
 extern void gfs2_unlinked_tag_print(struct gfs2_unlinked_tag *ut);
+#endif
 extern void gfs2_quota_change_print(struct gfs2_quota_change *qc);
 
 #endif /* __ONDISK_DOT_H__ */
--- cluster/gfs2/libgfs2/structures.c	2006/06/12 20:38:27	1.4
+++ cluster/gfs2/libgfs2/structures.c	2006/06/14 13:55:11	1.5
@@ -189,43 +189,6 @@
 }
 
 static void
-build_unlinked_tag(struct gfs2_inode *per_node, unsigned int j)
-{
-	struct gfs2_sbd *sdp = per_node->i_sbd;
-	struct gfs2_meta_header mh;
-	char name[256];
-	struct gfs2_inode *ip;
-	unsigned int blocks = sdp->utsize << (20 - sdp->bsize_shift);
-	unsigned int x;
-
-	memset(&mh, 0, sizeof(struct gfs2_meta_header));
-	mh.mh_magic = GFS2_MAGIC;
-	mh.mh_type = GFS2_METATYPE_UT;
-	mh.mh_format = GFS2_FORMAT_UT;
-
-	sprintf(name, "unlinked_tag%u", j);
-	ip = createi(per_node, name, S_IFREG | 0600,
-		     GFS2_DIF_SYSTEM);
-
-	for (x = 0; x < blocks; x++) {
-		struct gfs2_buffer_head *bh = get_file_buf(ip, ip->i_di.di_size >> sdp->bsize_shift);
-		if (!bh)
-			die("build_unlinked_tag\n");
-
-		gfs2_meta_header_out(&mh, bh->b_data);
-
-		brelse(bh, updated);
-	}
-
-	if (sdp->debug) {
-		printf("\nUnlinked Tag %u:\n", j);
-		gfs2_dinode_print(&ip->i_di);
-	}
-
-	inode_put(ip, updated);
-}
-
-static void
 build_quota_change(struct gfs2_inode *per_node, unsigned int j)
 {
 	struct gfs2_sbd *sdp = per_node->i_sbd;
@@ -274,7 +237,6 @@
 	for (j = 0; j < sdp->md.journals; j++) {
 		build_inum_range(per_node, j);
 		build_statfs_change(per_node, j);
-		build_unlinked_tag(per_node, j);
 		build_quota_change(per_node, j);
 	}