aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/sys.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2011-05-10 15:01:59 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2011-05-10 15:01:59 +0100
commit32e471ef1057e812856739d26b4a87d929fb8aa1 (patch)
treef4f0debf9505b91d284c4e93d4c5f1b5c5690991 /fs/gfs2/sys.c
parent2ab9cd1c63b519e37b21b504376822be983badba (diff)
downloadkernel_samsung_espresso10-32e471ef1057e812856739d26b4a87d929fb8aa1.zip
kernel_samsung_espresso10-32e471ef1057e812856739d26b4a87d929fb8aa1.tar.gz
kernel_samsung_espresso10-32e471ef1057e812856739d26b4a87d929fb8aa1.tar.bz2
GFS2: Use UUID field in generic superblock
The VFS superblock structure now has a UUID field, so we can use that in preference to the UUID field in the GFS2 superblock now. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/sys.c')
-rw-r--r--fs/gfs2/sys.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 748ccb5..e20eab3 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -81,7 +81,8 @@ static int gfs2_uuid_valid(const u8 *uuid)
static ssize_t uuid_show(struct gfs2_sbd *sdp, char *buf)
{
- const u8 *uuid = sdp->sd_sb.sb_uuid;
+ struct super_block *s = sdp->sd_vfs;
+ const u8 *uuid = s->s_uuid;
buf[0] = '\0';
if (!gfs2_uuid_valid(uuid))
return 0;
@@ -616,7 +617,8 @@ static int gfs2_uevent(struct kset *kset, struct kobject *kobj,
struct kobj_uevent_env *env)
{
struct gfs2_sbd *sdp = container_of(kobj, struct gfs2_sbd, sd_kobj);
- const u8 *uuid = sdp->sd_sb.sb_uuid;
+ struct super_block *s = sdp->sd_vfs;
+ const u8 *uuid = s->s_uuid;
add_uevent_var(env, "LOCKTABLE=%s", sdp->sd_table_name);
add_uevent_var(env, "LOCKPROTO=%s", sdp->sd_proto_name);