diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
| commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
| tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /fs/cramfs/inode.c | |
| parent | 825f9075d74028d11d7f5932f04e1b5db3022b51 (diff) | |
| parent | d834c16516d1ebec4766fc58c059bf01311e6045 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/cramfs/inode.c')
| -rw-r--r-- | fs/cramfs/inode.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index ad96b6990715..a624c3ec8189 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c | |||
| @@ -543,8 +543,15 @@ static struct file_system_type cramfs_fs_type = { | |||
| 543 | 543 | ||
| 544 | static int __init init_cramfs_fs(void) | 544 | static int __init init_cramfs_fs(void) |
| 545 | { | 545 | { |
| 546 | cramfs_uncompress_init(); | 546 | int rv; |
| 547 | return register_filesystem(&cramfs_fs_type); | 547 | |
| 548 | rv = cramfs_uncompress_init(); | ||
| 549 | if (rv < 0) | ||
| 550 | return rv; | ||
| 551 | rv = register_filesystem(&cramfs_fs_type); | ||
| 552 | if (rv < 0) | ||
| 553 | cramfs_uncompress_exit(); | ||
| 554 | return rv; | ||
| 548 | } | 555 | } |
| 549 | 556 | ||
| 550 | static void __exit exit_cramfs_fs(void) | 557 | static void __exit exit_cramfs_fs(void) |