Commit 8526fb37 authored by Jan Blunck's avatar Jan Blunck Committed by Arnd Bergmann

BKL: Remove BKL from HFS

The BKL is only used in put_super and fill_super that are both protected by
the superblocks s_umount rw_semaphore. Therefore it is safe to remove the
BKL entirely.
Signed-off-by: default avatarJan Blunck <jblunck@infradead.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f2143c4e
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/parser.h> #include <linux/parser.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smp_lock.h>
#include <linux/vfs.h> #include <linux/vfs.h>
#include "hfs_fs.h" #include "hfs_fs.h"
...@@ -79,15 +78,11 @@ static int hfs_sync_fs(struct super_block *sb, int wait) ...@@ -79,15 +78,11 @@ static int hfs_sync_fs(struct super_block *sb, int wait)
*/ */
static void hfs_put_super(struct super_block *sb) static void hfs_put_super(struct super_block *sb)
{ {
lock_kernel();
if (sb->s_dirt) if (sb->s_dirt)
hfs_write_super(sb); hfs_write_super(sb);
hfs_mdb_close(sb); hfs_mdb_close(sb);
/* release the MDB's resources */ /* release the MDB's resources */
hfs_mdb_put(sb); hfs_mdb_put(sb);
unlock_kernel();
} }
/* /*
...@@ -382,13 +377,10 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -382,13 +377,10 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
struct inode *root_inode; struct inode *root_inode;
int res; int res;
lock_kernel();
sbi = kzalloc(sizeof(struct hfs_sb_info), GFP_KERNEL); sbi = kzalloc(sizeof(struct hfs_sb_info), GFP_KERNEL);
if (!sbi) { if (!sbi)
unlock_kernel();
return -ENOMEM; return -ENOMEM;
}
sb->s_fs_info = sbi; sb->s_fs_info = sbi;
INIT_HLIST_HEAD(&sbi->rsrc_inodes); INIT_HLIST_HEAD(&sbi->rsrc_inodes);
...@@ -439,7 +431,6 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -439,7 +431,6 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_root->d_op = &hfs_dentry_operations; sb->s_root->d_op = &hfs_dentry_operations;
/* everything's okay */ /* everything's okay */
unlock_kernel();
return 0; return 0;
bail_iput: bail_iput:
...@@ -448,7 +439,6 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -448,7 +439,6 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
printk(KERN_ERR "hfs: get root inode failed.\n"); printk(KERN_ERR "hfs: get root inode failed.\n");
bail: bail:
hfs_mdb_put(sb); hfs_mdb_put(sb);
unlock_kernel();
return res; return res;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment