]> Pileus Git - ~andy/linux/commitdiff
BKL: Remove BKL from BFS
authorJan Blunck <jblunck@infradead.org>
Wed, 24 Feb 2010 12:25:29 +0000 (13:25 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 4 Oct 2010 19:10:35 +0000 (21:10 +0200)
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>
fs/bfs/inode.c

index d2e09363dd93b83a331c872fdac705c6180a8701..883e77acd5a8cd8e0c3598cb62e5993e82725d97 100644 (file)
@@ -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;
 }