aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3/super.c
diff options
context:
space:
mode:
authorJan Blunck <jblunck@infradead.org>2010-08-15 16:51:10 -0400
committerArnd Bergmann <arnd@arndb.de>2010-10-04 15:10:10 -0400
commitdb71922217a214e5c9268448e537b54fc1f301ea (patch)
tree9c9afbf29411547891f6968e5ade29ce59d66c07 /fs/ext3/super.c
parent899611ee7d373e5eeda08e9a8632684e1ebbbf00 (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/ext3/super.c')
-rw-r--r--fs/ext3/super.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 5dbf4dba03c..41f9dcd73e9 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1611,14 +1611,19 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
1611 __le32 features; 1611 __le32 features;
1612 int err; 1612 int err;
1613 1613
1614 lock_kernel();
1615
1614 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); 1616 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
1615 if (!sbi) 1617 if (!sbi) {
1618 unlock_kernel();
1616 return -ENOMEM; 1619 return -ENOMEM;
1620 }
1617 1621
1618 sbi->s_blockgroup_lock = 1622 sbi->s_blockgroup_lock =
1619 kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL); 1623 kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);
1620 if (!sbi->s_blockgroup_lock) { 1624 if (!sbi->s_blockgroup_lock) {
1621 kfree(sbi); 1625 kfree(sbi);
1626 unlock_kernel();
1622 return -ENOMEM; 1627 return -ENOMEM;
1623 } 1628 }
1624 sb->s_fs_info = sbi; 1629 sb->s_fs_info = sbi;
@@ -2026,6 +2031,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
2026 "writeback"); 2031 "writeback");
2027 2032
2028 lock_kernel(); 2033 lock_kernel();
2034 unlock_kernel();
2029 return 0; 2035 return 0;
2030 2036
2031cantfind_ext3: 2037cantfind_ext3:
@@ -2056,6 +2062,7 @@ out_fail:
2056 kfree(sbi->s_blockgroup_lock); 2062 kfree(sbi->s_blockgroup_lock);
2057 kfree(sbi); 2063 kfree(sbi);
2058 lock_kernel(); 2064 lock_kernel();
2065 unlock_kernel();
2059 return ret; 2066 return ret;
2060} 2067}
2061 2068