summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Blunck <jblunck@infradead.org>2010-02-24 13:25:29 +0100
committerArnd Bergmann <arnd@arndb.de>2010-10-04 21:10:35 +0200
commitba13d597a60a1a26614f18b76c1a2cad1a548e46 (patch)
tree3b9df6c49beea2fe5ce99ad80cf8d30174b79c67
parent74c41429ae5889933a2b9b9d0d2f687baa410766 (diff)
downloadblackbird-op-linux-ba13d597a60a1a26614f18b76c1a2cad1a548e46.tar.gz
blackbird-op-linux-ba13d597a60a1a26614f18b76c1a2cad1a548e46.zip
BKL: Remove BKL from BFS
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: Jan Blunck <jblunck@infradead.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--fs/bfs/inode.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index d2e09363dd93..883e77acd5a8 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -12,7 +12,6 @@
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/fs.h>
-#include <linux/smp_lock.h>
#include <linux/buffer_head.h>
#include <linux/vfs.h>
#include <linux/writeback.h>
@@ -215,14 +214,10 @@ static void bfs_put_super(struct super_block *s)
if (!info)
return;
- lock_kernel();
-
mutex_destroy(&info->bfs_lock);
kfree(info->si_imap);
kfree(info);
s->s_fs_info = NULL;
-
- unlock_kernel();
}
static int bfs_statfs(struct dentry *dentry, struct kstatfs *buf)
@@ -322,13 +317,9 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent)
int ret = -EINVAL;
unsigned long i_sblock, i_eblock, i_eoff, s_size;
- lock_kernel();
-
info = kzalloc(sizeof(*info), GFP_KERNEL);
- if (!info) {
- unlock_kernel();
+ if (!info)
return -ENOMEM;
- }
mutex_init(&info->bfs_lock);
s->s_fs_info = info;
@@ -443,7 +434,6 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent)
brelse(bh);
brelse(sbh);
dump_imap("read_super", s);
- unlock_kernel();
return 0;
out3:
@@ -457,7 +447,6 @@ out:
mutex_destroy(&info->bfs_lock);
kfree(info);
s->s_fs_info = NULL;
- unlock_kernel();
return ret;
}
OpenPOWER on IntegriCloud