Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BKL: Remove BKL from OCFS2

Browse source 
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>
This commit is contained in:
Arnd Bergmann 2010-02-24 13:25:33 +01:00
parent 3dbc4b32d0
commit 6005679412
3 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/ocfs2/dlmfs/dlmfs.c
View file

@ -44,7 +44,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/backing-dev.h> #include <linux/backing-dev.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -589,27 +588,21 @@ static int dlmfs_fill_super(struct super_block * sb,
struct inode * inode; struct inode * inode;
struct dentry * root; struct dentry * root;
lock_kernel();
sb->s_maxbytes = MAX_LFS_FILESIZE; sb->s_maxbytes = MAX_LFS_FILESIZE;
sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT; sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_magic = DLMFS_MAGIC; sb->s_magic = DLMFS_MAGIC;
sb->s_op = &dlmfs_ops; sb->s_op = &dlmfs_ops;
inode = dlmfs_get_root_inode(sb); inode = dlmfs_get_root_inode(sb);
if (!inode) { if (!inode)
unlock_kernel();
return -ENOMEM; return -ENOMEM;
}
root = d_alloc_root(inode); root = d_alloc_root(inode);
if (!root) { if (!root) {
iput(inode); iput(inode);
unlock_kernel();
return -ENOMEM; return -ENOMEM;
} }
sb->s_root = root; sb->s_root = root;
unlock_kernel();
return 0; return 0;
} }

3
fs/ocfs2/stack_user.c
View file

@ -22,7 +22,6 @@
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smp_lock.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -612,12 +611,10 @@ static int ocfs2_control_open(struct inode *inode, struct file *file)
return -ENOMEM; return -ENOMEM;
p->op_this_node = -1; p->op_this_node = -1;
lock_kernel();
mutex_lock(&ocfs2_control_lock); mutex_lock(&ocfs2_control_lock);
file->private_data = p; file->private_data = p;
list_add(&p->op_list, &ocfs2_control_private_list); list_add(&p->op_list, &ocfs2_control_private_list);
mutex_unlock(&ocfs2_control_lock); mutex_unlock(&ocfs2_control_lock);
unlock_kernel();
return 0; return 0;
} }

12
fs/ocfs2/super.c
View file

@ -609,8 +609,6 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)
struct mount_options parsed_options; struct mount_options parsed_options;
struct ocfs2_super *osb = OCFS2_SB(sb); struct ocfs2_super *osb = OCFS2_SB(sb);
lock_kernel();
if (!ocfs2_parse_options(sb, data, &parsed_options, 1) || if (!ocfs2_parse_options(sb, data, &parsed_options, 1) ||
!ocfs2_check_set_options(sb, &parsed_options)) { !ocfs2_check_set_options(sb, &parsed_options)) {
ret = -EINVAL; ret = -EINVAL;
@ -717,7 +715,6 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)
MS_POSIXACL : 0); MS_POSIXACL : 0);
} }
out: out:
unlock_kernel();
return ret; return ret;
} }
@ -1002,8 +999,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
char nodestr[8]; char nodestr[8];
struct ocfs2_blockcheck_stats stats; struct ocfs2_blockcheck_stats stats;
lock_kernel();
mlog_entry("%p, %p, %i", sb, data, silent); mlog_entry("%p, %p, %i", sb, data, silent);
if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) { if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) {
@ -1181,7 +1176,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
atomic_set(&osb->vol_state, VOLUME_DISABLED); atomic_set(&osb->vol_state, VOLUME_DISABLED);
wake_up(&osb->osb_mount_event); wake_up(&osb->osb_mount_event);
mlog_exit(status); mlog_exit(status);
unlock_kernel();
return status; return status;
} }
} }
@ -1196,7 +1190,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
ocfs2_orphan_scan_start(osb); ocfs2_orphan_scan_start(osb);
mlog_exit(status); mlog_exit(status);
unlock_kernel();
return status; return status;
read_super_error: read_super_error:
@ -1212,7 +1205,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
} }
mlog_exit(status); mlog_exit(status);
unlock_kernel();
return status; return status;
} }
@ -1645,13 +1637,9 @@ static void ocfs2_put_super(struct super_block *sb)
{ {
mlog_entry("(0x%p)\n", sb); mlog_entry("(0x%p)\n", sb);
lock_kernel();
ocfs2_sync_blockdev(sb); ocfs2_sync_blockdev(sb);
ocfs2_dismount_volume(sb, 0); ocfs2_dismount_volume(sb, 0);
unlock_kernel();
mlog_exit_void(); mlog_exit_void();
} }