diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-10-21 15:53:15 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-21 18:48:04 +0200 |
commit | 073c21416268658bd1bc573af85eeac2ebb56ed5 (patch) | |
tree | 66553303809cc8c1ef7229058d8d5a5670bb301f /fs/qnx4/inode.c | |
parent | 5a44a73b9015e89cfb280ba0534dfcbf1ef29d05 (diff) | |
download | op-kernel-dev-073c21416268658bd1bc573af85eeac2ebb56ed5.zip op-kernel-dev-073c21416268658bd1bc573af85eeac2ebb56ed5.tar.gz |
BKL: remove BKL from qnx4
All uses of the BKL in qnx4 were the result of a pushdown into
code that doesn't really need it. As Christoph points out, this
is a read-only file system, which eliminates most of the races in
readdir/lookup.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Anders Larsen <al@alarsen.net>
Cc: Christoph Hellwig <hch@infradead.org>
Diffstat (limited to 'fs/qnx4/inode.c')
-rw-r--r-- | fs/qnx4/inode.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 86a7be1..01bad30 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c @@ -16,7 +16,6 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/highuid.h> -#include <linux/smp_lock.h> #include <linux/pagemap.h> #include <linux/buffer_head.h> #include <linux/writeback.h> @@ -157,8 +156,6 @@ static int qnx4_statfs(struct dentry *dentry, struct kstatfs *buf) struct super_block *sb = dentry->d_sb; u64 id = huge_encode_dev(sb->s_bdev->bd_dev); - lock_kernel(); - buf->f_type = sb->s_magic; buf->f_bsize = sb->s_blocksize; buf->f_blocks = le32_to_cpu(qnx4_sb(sb)->BitMap->di_size) * 8; @@ -168,8 +165,6 @@ static int qnx4_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_fsid.val[0] = (u32)id; buf->f_fsid.val[1] = (u32)(id >> 32); - unlock_kernel(); - return 0; } @@ -234,13 +229,9 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) struct qnx4_sb_info *qs; int ret = -EINVAL; - lock_kernel(); - qs = kzalloc(sizeof(struct qnx4_sb_info), GFP_KERNEL); - if (!qs) { - unlock_kernel(); + if (!qs) return -ENOMEM; - } s->s_fs_info = qs; sb_set_blocksize(s, QNX4_BLOCK_SIZE); @@ -287,8 +278,6 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) goto outi; brelse(bh); - - unlock_kernel(); return 0; outi: @@ -298,7 +287,6 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) outnobh: kfree(qs); s->s_fs_info = NULL; - unlock_kernel(); return ret; } |