diff options
author | Jan Blunck <jblunck@infradead.org> | 2010-08-15 16:51:10 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-04 15:10:10 -0400 |
commit | db71922217a214e5c9268448e537b54fc1f301ea (patch) | |
tree | 9c9afbf29411547891f6968e5ade29ce59d66c07 /fs/squashfs | |
parent | 899611ee7d373e5eeda08e9a8632684e1ebbbf00 (diff) |
BKL: Explicitly add BKL around get_sb/fill_super
This patch is a preparation necessary to remove the BKL from do_new_mount().
It explicitly adds calls to lock_kernel()/unlock_kernel() around
get_sb/fill_super operations for filesystems that still uses the BKL.
I've read through all the code formerly covered by the BKL inside
do_kern_mount() and have satisfied myself that it doesn't need the BKL
any more.
do_kern_mount() is already called without the BKL when mounting the rootfs
and in nfsctl. do_kern_mount() calls vfs_kern_mount(), which is called
from various places without BKL: simple_pin_fs(), nfs_do_clone_mount()
through nfs_follow_mountpoint(), afs_mntpt_do_automount() through
afs_mntpt_follow_link(). Both later functions are actually the filesystems
follow_link inode operation. vfs_kern_mount() is calling the specified
get_sb function and lets the filesystem do its job by calling the given
fill_super function.
Therefore I think it is safe to push down the BKL from the VFS to the
low-level filesystems get_sb/fill_super operation.
[arnd: do not add the BKL to those file systems that already
don't use it elsewhere]
Signed-off-by: Jan Blunck <jblunck@infradead.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Christoph Hellwig <hch@infradead.org>
Diffstat (limited to 'fs/squashfs')
-rw-r--r-- | fs/squashfs/super.c | 6 |
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 | ||
306 | failed_mount: | 310 | failed_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 | ||
320 | failure: | 325 | failure: |
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 | ||