diff options
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r-- | fs/ocfs2/super.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 0e91ec22a940..01b85165552b 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -1266,6 +1266,7 @@ static struct file_system_type ocfs2_fs_type = { | |||
1266 | .fs_flags = FS_REQUIRES_DEV|FS_RENAME_DOES_D_MOVE, | 1266 | .fs_flags = FS_REQUIRES_DEV|FS_RENAME_DOES_D_MOVE, |
1267 | .next = NULL | 1267 | .next = NULL |
1268 | }; | 1268 | }; |
1269 | MODULE_ALIAS_FS("ocfs2"); | ||
1269 | 1270 | ||
1270 | static int ocfs2_check_set_options(struct super_block *sb, | 1271 | static int ocfs2_check_set_options(struct super_block *sb, |
1271 | struct mount_options *options) | 1272 | struct mount_options *options) |
@@ -2525,8 +2526,7 @@ static int ocfs2_check_volume(struct ocfs2_super *osb) | |||
2525 | mlog_errno(status); | 2526 | mlog_errno(status); |
2526 | 2527 | ||
2527 | finally: | 2528 | finally: |
2528 | if (local_alloc) | 2529 | kfree(local_alloc); |
2529 | kfree(local_alloc); | ||
2530 | 2530 | ||
2531 | if (status) | 2531 | if (status) |
2532 | mlog_errno(status); | 2532 | mlog_errno(status); |
@@ -2553,8 +2553,7 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb) | |||
2553 | * we free it here. | 2553 | * we free it here. |
2554 | */ | 2554 | */ |
2555 | kfree(osb->journal); | 2555 | kfree(osb->journal); |
2556 | if (osb->local_alloc_copy) | 2556 | kfree(osb->local_alloc_copy); |
2557 | kfree(osb->local_alloc_copy); | ||
2558 | kfree(osb->uuid_str); | 2557 | kfree(osb->uuid_str); |
2559 | ocfs2_put_dlm_debug(osb->osb_dlm_debug); | 2558 | ocfs2_put_dlm_debug(osb->osb_dlm_debug); |
2560 | memset(osb, 0, sizeof(struct ocfs2_super)); | 2559 | memset(osb, 0, sizeof(struct ocfs2_super)); |