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/ocfs2/super.c | |
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/ocfs2/super.c')
-rw-r--r-- | fs/ocfs2/super.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index fa1be1b304d1..b7e4f2d19d40 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -1002,6 +1002,8 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) | |||
1002 | char nodestr[8]; | 1002 | char nodestr[8]; |
1003 | struct ocfs2_blockcheck_stats stats; | 1003 | struct ocfs2_blockcheck_stats stats; |
1004 | 1004 | ||
1005 | lock_kernel(); | ||
1006 | |||
1005 | mlog_entry("%p, %p, %i", sb, data, silent); | 1007 | mlog_entry("%p, %p, %i", sb, data, silent); |
1006 | 1008 | ||
1007 | if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) { | 1009 | if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) { |
@@ -1179,6 +1181,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) | |||
1179 | atomic_set(&osb->vol_state, VOLUME_DISABLED); | 1181 | atomic_set(&osb->vol_state, VOLUME_DISABLED); |
1180 | wake_up(&osb->osb_mount_event); | 1182 | wake_up(&osb->osb_mount_event); |
1181 | mlog_exit(status); | 1183 | mlog_exit(status); |
1184 | unlock_kernel(); | ||
1182 | return status; | 1185 | return status; |
1183 | } | 1186 | } |
1184 | } | 1187 | } |
@@ -1193,6 +1196,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) | |||
1193 | ocfs2_orphan_scan_start(osb); | 1196 | ocfs2_orphan_scan_start(osb); |
1194 | 1197 | ||
1195 | mlog_exit(status); | 1198 | mlog_exit(status); |
1199 | unlock_kernel(); | ||
1196 | return status; | 1200 | return status; |
1197 | 1201 | ||
1198 | read_super_error: | 1202 | read_super_error: |
@@ -1208,6 +1212,7 @@ read_super_error: | |||
1208 | } | 1212 | } |
1209 | 1213 | ||
1210 | mlog_exit(status); | 1214 | mlog_exit(status); |
1215 | unlock_kernel(); | ||
1211 | return status; | 1216 | return status; |
1212 | } | 1217 | } |
1213 | 1218 | ||