diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-02-24 13:25:33 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-04 21:10:51 +0200 |
| commit | 60056794127a25d641465b706e8828186f7a2e1f (patch) | |
| tree | d325fbc91d9eb5f1373d2a6c90dfe5bd34c4cc7d /fs/ocfs2/dlmfs/dlmfs.c | |
| parent | 3dbc4b32d0b39701cbec65582e196a20889155fb (diff) | |
| download | op-kernel-dev-60056794127a25d641465b706e8828186f7a2e1f.zip op-kernel-dev-60056794127a25d641465b706e8828186f7a2e1f.tar.gz | |
BKL: Remove BKL from OCFS2
The BKL in ocfs2/dlmfs is used in put_super, fill_super and remount_fs
that are all three protected by the superblocks s_umount rw_semaphore.
The use in ocfs2_control_open is evidently unrelated and the function
is protected by ocfs2_control_lock.
Therefore it is safe to remove the BKL entirely.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlmfs/dlmfs.c')
| -rw-r--r-- | fs/ocfs2/dlmfs/dlmfs.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index 667d7ce..c2903b8 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c @@ -44,7 +44,6 @@ #include <linux/string.h> #include <linux/backing-dev.h> #include <linux/poll.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> @@ -589,27 +588,21 @@ static int dlmfs_fill_super(struct super_block * sb, struct inode * inode; struct dentry * root; - lock_kernel(); - sb->s_maxbytes = MAX_LFS_FILESIZE; sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; sb->s_magic = DLMFS_MAGIC; sb->s_op = &dlmfs_ops; inode = dlmfs_get_root_inode(sb); - if (!inode) { - unlock_kernel(); + if (!inode) return -ENOMEM; - } root = d_alloc_root(inode); if (!root) { iput(inode); - unlock_kernel(); return -ENOMEM; } sb->s_root = root; - unlock_kernel(); return 0; } |
