Attachment 294286 Details for Bug 431952 – Proposed patch to fix the problem

[patch] Proposed patch to fix the problem

431952.gfs.deviceid.patch (text/plain), 1.91 KB, created by Robert Peterson on 2008-02-07 23:19:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2008-02-07 23:19:43 UTC

Size: 1.91 KB

patch

obsolete

>Index: proc.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs-kernel/src/gfs/proc.c,v
>retrieving revision 1.10
>diff -w -u -p -p -u -r1.10 proc.c
>--- proc.c	18 Jul 2006 21:18:48 -0000	1.10
>+++ proc.c	7 Feb 2008 23:15:33 -0000
>@@ -77,6 +77,7 @@ 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;
> 
>@@ -85,8 +86,10 @@ 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);
>+		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(sdp->sd_vfs->s_id) +
>+			strlen(device_id) +
> 			strlen(sdp->sd_fsname) + 3;
> 	}
> 
>@@ -105,8 +108,10 @@ 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);
>+		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, sdp->sd_vfs->s_id, sdp->sd_fsname);
>+			     (unsigned long)sdp, device_id, sdp->sd_fsname);
> 	}
> 
> 	if (copy_to_user(user_buf, buf, x))
>Index: sys.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs-kernel/src/gfs/sys.c,v
>retrieving revision 1.3
>diff -w -u -p -p -u -r1.3 sys.c
>--- sys.c	18 Jul 2006 20:48:20 -0000	1.3
>+++ sys.c	7 Feb 2008 23:15:33 -0000
>@@ -33,7 +33,8 @@ spinlock_t gfs_sys_margs_lock;
> 
> static ssize_t id_show(struct gfs_sbd *sdp, char *buf)
> {
>-	return sprintf(buf, "%s\n", sdp->sd_vfs->s_id);
>+	return sprintf(buf, "%u:%u\n", MAJOR(sdp->sd_vfs->s_dev),
>+		       MINOR(sdp->sd_vfs->s_dev));
> }
> 
> static ssize_t fsname_show(struct gfs_sbd *sdp, char *buf)

Actions: View | Diff

Attachments on bug 431952: 294286