aboutsummaryrefslogtreecommitdiffstats
path: root/fs/squashfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/squashfs')
-rw-r--r--fs/squashfs/super.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 88b4f8606652..ab1a401a0e19 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -87,11 +87,14 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
87 u64 lookup_table_start, xattr_id_table_start; 87 u64 lookup_table_start, xattr_id_table_start;
88 int err; 88 int err;
89 89
90 lock_kernel();
91
90 TRACE("Entered squashfs_fill_superblock\n"); 92 TRACE("Entered squashfs_fill_superblock\n");
91 93
92 sb->s_fs_info = kzalloc(sizeof(*msblk), GFP_KERNEL); 94 sb->s_fs_info = kzalloc(sizeof(*msblk), GFP_KERNEL);
93 if (sb->s_fs_info == NULL) { 95 if (sb->s_fs_info == NULL) {
94 ERROR("Failed to allocate squashfs_sb_info\n"); 96 ERROR("Failed to allocate squashfs_sb_info\n");
97 unlock_kernel();
95 return -ENOMEM; 98 return -ENOMEM;
96 } 99 }
97 msblk = sb->s_fs_info; 100 msblk = sb->s_fs_info;
@@ -301,6 +304,7 @@ allocate_root:
301 304
302 TRACE("Leaving squashfs_fill_super\n"); 305 TRACE("Leaving squashfs_fill_super\n");
303 kfree(sblk); 306 kfree(sblk);
307 unlock_kernel();
304 return 0; 308 return 0;
305 309
306failed_mount: 310failed_mount:
@@ -315,11 +319,13 @@ failed_mount:
315 kfree(sb->s_fs_info); 319 kfree(sb->s_fs_info);
316 sb->s_fs_info = NULL; 320 sb->s_fs_info = NULL;
317 kfree(sblk); 321 kfree(sblk);
322 unlock_kernel();
318 return err; 323 return err;
319 324
320failure: 325failure:
321 kfree(sb->s_fs_info); 326 kfree(sb->s_fs_info);
322 sb->s_fs_info = NULL; 327 sb->s_fs_info = NULL;
328 unlock_kernel();
323 return -ENOMEM; 329 return -ENOMEM;
324} 330}
325 331