cluster: STABLE3 - mkfs: Remove unused code

Fabio M. Di Nitto fabbione@fedoraproject.org
Fri Jan 23 11:58:00 GMT 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d4f5b4fc02368f4a855dda1bd291a92e7b0f0e0b
Commit:        d4f5b4fc02368f4a855dda1bd291a92e7b0f0e0b
Parent:        83151921bbd421934e3f53af7754b4197efd2084
Author:        Steven Whitehouse <swhiteho@redhat.com>
AuthorDate:    Fri Jan 23 10:23:08 2009 +0000
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Jan 23 12:51:48 2009 +0100

mkfs: Remove unused code

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
 gfs2/mkfs/main_jadd.c |   33 ---------------------------------
 1 files changed, 0 insertions(+), 33 deletions(-)

diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c
index f0255d0..3197fe5 100644
--- a/gfs2/mkfs/main_jadd.c
+++ b/gfs2/mkfs/main_jadd.c
@@ -10,7 +10,6 @@
 #include <sys/file.h>
 #include <sys/vfs.h>
 #include <sys/mount.h>
-//#include <linux/fs.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <time.h>
@@ -323,37 +322,6 @@ add_qc(struct gfs2_sbd *sdp)
 		    new_name, error, strerror(errno));
 }
 
-#if 0 /* FIXME: When we have a mountpoint in sysfs for gfs2meta, enable this 
-       * to get the lock_table name and block size from the ondisk superblock
-       */
-void 
-read_superblock(struct gfs2_sbd *sdp)
-{
-	int fd;
-	char buf[PATH_MAX];
-	
-	fd = open(sdp->device_name, O_RDONLY);
-	if (fd < 0) {
-		die("Could not open the block device %s: %s\n",
-			sdp->device_name, strerror(errno));
-	}
-	do_lseek(fd, 0x10 * 4096);
-	do_read(fd, buf, PATH_MAX);
-	gfs2_sb_in(&(sdp->sd_sb), buf);
-	sdp->bsize = sdp->sd_sb.sb_bsize;
-	strcpy(lock_table,sdp->sd_sb.sb_locktable);
-	sprintf(sdp->meta_mount, "%s%s%s", "/sys/fs/gfs2/", lock_table,
-		"/meta");
-
-	close(fd);
-}
-
-void 
-gather_info(struct gfs2_sbd *sdp)
-{
-	read_superblock(sdp);
-}
-#else
 void 
 gather_info(struct gfs2_sbd *sdp)
 {
@@ -364,7 +332,6 @@ gather_info(struct gfs2_sbd *sdp)
 	}
 	sdp->bsize = statbuf.f_bsize;
 }
-#endif 
 
 void 
 find_current_journals(struct gfs2_sbd *sdp)



More information about the Cluster-cvs mailing list