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/hfs | |
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/hfs')
-rw-r--r-- | fs/hfs/super.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/hfs/super.c b/fs/hfs/super.c index 34235d4bf08b..3069416fa8ef 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c | |||
@@ -382,9 +382,13 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) | |||
382 | struct inode *root_inode; | 382 | struct inode *root_inode; |
383 | int res; | 383 | int res; |
384 | 384 | ||
385 | lock_kernel(); | ||
386 | |||
385 | sbi = kzalloc(sizeof(struct hfs_sb_info), GFP_KERNEL); | 387 | sbi = kzalloc(sizeof(struct hfs_sb_info), GFP_KERNEL); |
386 | if (!sbi) | 388 | if (!sbi) { |
389 | unlock_kernel(); | ||
387 | return -ENOMEM; | 390 | return -ENOMEM; |
391 | } | ||
388 | sb->s_fs_info = sbi; | 392 | sb->s_fs_info = sbi; |
389 | INIT_HLIST_HEAD(&sbi->rsrc_inodes); | 393 | INIT_HLIST_HEAD(&sbi->rsrc_inodes); |
390 | 394 | ||
@@ -435,6 +439,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) | |||
435 | sb->s_root->d_op = &hfs_dentry_operations; | 439 | sb->s_root->d_op = &hfs_dentry_operations; |
436 | 440 | ||
437 | /* everything's okay */ | 441 | /* everything's okay */ |
442 | unlock_kernel(); | ||
438 | return 0; | 443 | return 0; |
439 | 444 | ||
440 | bail_iput: | 445 | bail_iput: |
@@ -443,6 +448,7 @@ bail_no_root: | |||
443 | printk(KERN_ERR "hfs: get root inode failed.\n"); | 448 | printk(KERN_ERR "hfs: get root inode failed.\n"); |
444 | bail: | 449 | bail: |
445 | hfs_mdb_put(sb); | 450 | hfs_mdb_put(sb); |
451 | unlock_kernel(); | ||
446 | return res; | 452 | return res; |
447 | } | 453 | } |
448 | 454 | ||