Attachment 294401 Details for Bug 431945 – Proposed gfs2 kernel patch--try #2

[patch] Proposed gfs2 kernel patch--try #2

431945.gfs.device_id.try2.patch (text/plain), 1.57 KB, created by Robert Peterson on 2008-02-08 19:26:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2008-02-08 19:26:02 UTC

Size: 1.57 KB

patch

obsolete

>Index: proc.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs-kernel/src/gfs/proc.c,v
>retrieving revision 1.6
>diff -w -u -p -p -u -r1.6 proc.c
>--- proc.c	4 Jan 2005 10:07:12 -0000	1.6
>+++ proc.c	8 Feb 2008 19:23:38 -0000
>@@ -27,6 +27,7 @@
> #include "lm.h"
> #include "proc.h"
> #include "super.h"
>+#include "diaper.h"
> 
> struct list_head gfs_fs_list;
> struct semaphore gfs_fs_lock;
>@@ -77,16 +78,21 @@ do_list(char *user_buf, size_t size)
> 	struct gfs_sbd *sdp = NULL;
> 	unsigned int x;
> 	char num[21];
>+	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));
> 		x += sprintf(num, "%lu", (unsigned long)sdp) +
>-			strlen(sdp->sd_vfs->s_id) +
>+			strlen(device_id) +
> 			strlen(sdp->sd_fsname) + 3;
> 	}
> 
>@@ -105,8 +111,11 @@ 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));
> 		x += sprintf(buf + x, "%lu %s %s\n",
>-			     (unsigned long)sdp, sdp->sd_vfs->s_id, sdp->sd_fsname);
>+			     (unsigned long)sdp, device_id, sdp->sd_fsname);
> 	}
> 
> 	if (copy_to_user(user_buf, buf, x))

Actions: View | Diff

Attachments on bug 431945: 294291 | 294401