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/qnx4 | |
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/qnx4')
-rw-r--r-- | fs/qnx4/inode.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 16829722be93..86a7be1399a8 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -234,9 +234,13 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) | |||
234 | struct qnx4_sb_info *qs; | 234 | struct qnx4_sb_info *qs; |
235 | int ret = -EINVAL; | 235 | int ret = -EINVAL; |
236 | 236 | ||
237 | lock_kernel(); | ||
238 | |||
237 | qs = kzalloc(sizeof(struct qnx4_sb_info), GFP_KERNEL); | 239 | qs = kzalloc(sizeof(struct qnx4_sb_info), GFP_KERNEL); |
238 | if (!qs) | 240 | if (!qs) { |
241 | unlock_kernel(); | ||
239 | return -ENOMEM; | 242 | return -ENOMEM; |
243 | } | ||
240 | s->s_fs_info = qs; | 244 | s->s_fs_info = qs; |
241 | 245 | ||
242 | sb_set_blocksize(s, QNX4_BLOCK_SIZE); | 246 | sb_set_blocksize(s, QNX4_BLOCK_SIZE); |
@@ -284,6 +288,7 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) | |||
284 | 288 | ||
285 | brelse(bh); | 289 | brelse(bh); |
286 | 290 | ||
291 | unlock_kernel(); | ||
287 | return 0; | 292 | return 0; |
288 | 293 | ||
289 | outi: | 294 | outi: |
@@ -293,6 +298,7 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) | |||
293 | outnobh: | 298 | outnobh: |
294 | kfree(qs); | 299 | kfree(qs); |
295 | s->s_fs_info = NULL; | 300 | s->s_fs_info = NULL; |
301 | unlock_kernel(); | ||
296 | return ret; | 302 | return ret; |
297 | } | 303 | } |
298 | 304 | ||