Eric Lee / smarc-ti-linux-kernel | Embedian Git Server

Commit b35997d4482ed24b43a5951c5b021d224b24293c

Authored by Robert Peterson 2007-06-07 22:10:01 +0800

Committed by Steven Whitehouse 2007-07-09 15:23:24 +0800

[GFS2] Can't mount GFS2 file system on AoE device

This patch fixes bug 243131: Can't mount GFS2 file system on AoE device.
When using AoE devices with lock_nolock, there is no locking table, so
gfs2 (and gfs1) uses the superblock s_id.  This turns out to be the device
name in some cases.  In the case of AoE, the device contains a slash,
(e.g. "etherd/e1.1p2") which is an invalid character when we try to
register the table in sysfs.  This patch replaces the "/" with underscore.
Rather than add a new variable to the stack, I'm just reusing a (char *)
variable that's no longer used: table.

This code has been tested on the failing system using a RHEL5 patch.
The upstream code was tested by using gfs2_tool sb to interject a "/"
into the table name of a clustered gfs2 file system.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

fs/gfs2/ops_fstype.c

fs/gfs2/ops_fstype.c

Diff comments View file @ b35997d

...	...	@@ -145,6 +145,9 @@
145	145	snprintf(sdp->sd_proto_name, GFS2_FSNAME_LEN, "%s", proto);
146	146	snprintf(sdp->sd_table_name, GFS2_FSNAME_LEN, "%s", table);
147	147
	148	+ while ((table = strchr(sdp->sd_table_name, '/')))
	149	+ *table = '_';
	150	+
148	151	out:
149	152	return error;
150	153	}