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/ntfs | |
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/ntfs')
-rw-r--r-- | fs/ntfs/super.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 512806171bfa..1f31e77fc41f 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c | |||
@@ -2732,6 +2732,8 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) | |||
2732 | struct inode *tmp_ino; | 2732 | struct inode *tmp_ino; |
2733 | int blocksize, result; | 2733 | int blocksize, result; |
2734 | 2734 | ||
2735 | lock_kernel(); | ||
2736 | |||
2735 | /* | 2737 | /* |
2736 | * We do a pretty difficult piece of bootstrap by reading the | 2738 | * We do a pretty difficult piece of bootstrap by reading the |
2737 | * MFT (and other metadata) from disk into memory. We'll only | 2739 | * MFT (and other metadata) from disk into memory. We'll only |
@@ -2755,6 +2757,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) | |||
2755 | ntfs_error(sb, "Allocation of NTFS volume structure " | 2757 | ntfs_error(sb, "Allocation of NTFS volume structure " |
2756 | "failed. Aborting mount..."); | 2758 | "failed. Aborting mount..."); |
2757 | lockdep_on(); | 2759 | lockdep_on(); |
2760 | unlock_kernel(); | ||
2758 | return -ENOMEM; | 2761 | return -ENOMEM; |
2759 | } | 2762 | } |
2760 | /* Initialize ntfs_volume structure. */ | 2763 | /* Initialize ntfs_volume structure. */ |
@@ -2942,6 +2945,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) | |||
2942 | sb->s_export_op = &ntfs_export_ops; | 2945 | sb->s_export_op = &ntfs_export_ops; |
2943 | lock_kernel(); | 2946 | lock_kernel(); |
2944 | lockdep_on(); | 2947 | lockdep_on(); |
2948 | unlock_kernel(); | ||
2945 | return 0; | 2949 | return 0; |
2946 | } | 2950 | } |
2947 | ntfs_error(sb, "Failed to allocate root directory."); | 2951 | ntfs_error(sb, "Failed to allocate root directory."); |
@@ -3062,6 +3066,7 @@ err_out_now: | |||
3062 | kfree(vol); | 3066 | kfree(vol); |
3063 | ntfs_debug("Failed, returning -EINVAL."); | 3067 | ntfs_debug("Failed, returning -EINVAL."); |
3064 | lockdep_on(); | 3068 | lockdep_on(); |
3069 | unlock_kernel(); | ||
3065 | return -EINVAL; | 3070 | return -EINVAL; |
3066 | } | 3071 | } |
3067 | 3072 | ||