Cluster Project branch, master, updated. gfs-kernel_0_1_22-97-ge2d5851

[fabbione@sourceware.org]

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=e2d5851746943491c9c90bd881669ee70d8caed3

The branch, master has been updated
       via  e2d5851746943491c9c90bd881669ee70d8caed3 (commit)
      from  1c340e0e7e1a6c0b7402db2ee22e240e25d28728 (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 e2d5851746943491c9c90bd881669ee70d8caed3
Author: Bob Peterson <rpeterso@redhat.com>
Date:   Mon Mar 24 09:51:36 2008 -0500

    Update to prior commit for bz431945: I forgot that STABLE2
    does not have a diaper device.

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

Summary of changes:
 gfs-kernel/src/gfs/proc.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gfs-kernel/src/gfs/proc.c b/gfs-kernel/src/gfs/proc.c
index b58181c..1c38b0d 100644
--- a/gfs-kernel/src/gfs/proc.c
+++ b/gfs-kernel/src/gfs/proc.c
@@ -27,7 +27,6 @@
 #include "lm.h"
 #include "proc.h"
 #include "super.h"
-#include "diaper.h"
 
 struct list_head gfs_fs_list;
 struct semaphore gfs_fs_lock;
@@ -81,16 +80,14 @@ do_list(char *user_buf, size_t size)
 	char device_id[32];
 	char *buf;
 	int error = 0;
-	struct block_device *bdevice;
 
 	down(&gfs_fs_lock);
 
 	x = 0;
 	for (tmp = gfs_fs_list.next; tmp != &gfs_fs_list; tmp = tmp->next) {
 		sdp = list_entry(tmp, struct gfs_sbd, sd_list);
-		bdevice = gfs_diaper_2real(sdp->sd_vfs->s_bdev);
-		sprintf(device_id, "%u:%u", MAJOR(bdevice->bd_dev),
-			MINOR(bdevice->bd_dev));
+		sprintf(device_id, "%u:%u", MAJOR(sdp->sd_vfs->s_dev),
+			MINOR(sdp->sd_vfs->s_dev));
 		x += sprintf(num, "%lu", (unsigned long)sdp) +
 			strlen(device_id) +
 			strlen(sdp->sd_fsname) + 3;
@@ -111,9 +108,8 @@ do_list(char *user_buf, size_t size)
 	x = 0;
 	for (tmp = gfs_fs_list.next; tmp != &gfs_fs_list; tmp = tmp->next) {
 		sdp = list_entry(tmp, struct gfs_sbd, sd_list);
-		bdevice = gfs_diaper_2real(sdp->sd_vfs->s_bdev);
-		sprintf(device_id, "%u:%u", MAJOR(bdevice->bd_dev),
-			MINOR(bdevice->bd_dev));
+		sprintf(device_id, "%u:%u", MAJOR(sdp->sd_vfs->s_dev),
+			MINOR(sdp->sd_vfs->s_dev));
 		x += sprintf(buf + x, "%lu %s %s\n",
 			     (unsigned long)sdp, device_id, sdp->sd_fsname);
 	}


hooks/post-receive
--
Cluster Project