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/isofs | |
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/isofs')
-rw-r--r-- | fs/isofs/inode.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 5a44811b5027..05baf7721e8c 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
@@ -571,11 +571,15 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) | |||
571 | int table, error = -EINVAL; | 571 | int table, error = -EINVAL; |
572 | unsigned int vol_desc_start; | 572 | unsigned int vol_desc_start; |
573 | 573 | ||
574 | lock_kernel(); | ||
575 | |||
574 | save_mount_options(s, data); | 576 | save_mount_options(s, data); |
575 | 577 | ||
576 | sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); | 578 | sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); |
577 | if (!sbi) | 579 | if (!sbi) { |
580 | unlock_kernel(); | ||
578 | return -ENOMEM; | 581 | return -ENOMEM; |
582 | } | ||
579 | s->s_fs_info = sbi; | 583 | s->s_fs_info = sbi; |
580 | 584 | ||
581 | if (!parse_options((char *)data, &opt)) | 585 | if (!parse_options((char *)data, &opt)) |
@@ -900,6 +904,7 @@ root_found: | |||
900 | 904 | ||
901 | kfree(opt.iocharset); | 905 | kfree(opt.iocharset); |
902 | 906 | ||
907 | unlock_kernel(); | ||
903 | return 0; | 908 | return 0; |
904 | 909 | ||
905 | /* | 910 | /* |
@@ -939,6 +944,7 @@ out_freesbi: | |||
939 | kfree(opt.iocharset); | 944 | kfree(opt.iocharset); |
940 | kfree(sbi); | 945 | kfree(sbi); |
941 | s->s_fs_info = NULL; | 946 | s->s_fs_info = NULL; |
947 | unlock_kernel(); | ||
942 | return error; | 948 | return error; |
943 | } | 949 | } |
944 | 950 | ||