Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / gfs2 / sys.c

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 159aedf..dd15b8e 100644 (file)
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -118,7 +118,7 @@ static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 
 static ssize_t withdraw_show(struct gfs2_sbd *sdp, char *buf)
 {
-       unsigned int b = test_bit(SDF_SHUTDOWN, &sdp->sd_flags);
+       unsigned int b = test_bit(SDF_WITHDRAWN, &sdp->sd_flags);
        return snprintf(buf, PAGE_SIZE, "%u\n", b);
 }
 
@@ -296,17 +296,18 @@ static struct attribute *gfs2_attrs[] = {
        &gfs2_attr_demote_rq.attr,
        NULL,
 };
+ATTRIBUTE_GROUPS(gfs2);
 
 static void gfs2_sbd_release(struct kobject *kobj)
 {
        struct gfs2_sbd *sdp = container_of(kobj, struct gfs2_sbd, sd_kobj);
 
-       kfree(sdp);
+       free_sbd(sdp);
 }
 
 static struct kobj_type gfs2_ktype = {
        .release = gfs2_sbd_release,
-       .default_attrs = gfs2_attrs,
+       .default_groups = gfs2_groups,
        .sysfs_ops     = &gfs2_attr_ops,
 };
 
@@ -679,7 +680,6 @@ fail_lock_module:
 fail_tune:
        sysfs_remove_group(&sdp->sd_kobj, &tune_group);
 fail_reg:
-       free_percpu(sdp->sd_lkstats);
        fs_err(sdp, "error %d adding sysfs files\n", error);
        kobject_put(&sdp->sd_kobj);
        sb->s_fs_info = NULL;