adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 11:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

get rid of BKL in fs/sysv

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2009-06-16 23:59:37 -04:00
parent cc46759a8c
commit 5ac3455a84
2 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/sysv/dir.c
View file

@ -15,13 +15,13 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/smp_lock.h>
#include <linux/swap.h> #include <linux/swap.h>
#include "sysv.h" #include "sysv.h"
static int sysv_readdir(struct file *, void *, filldir_t); static int sysv_readdir(struct file *, void *, filldir_t);
const struct file_operations sysv_dir_operations = { const struct file_operations sysv_dir_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir, .read = generic_read_dir,
.readdir = sysv_readdir, .readdir = sysv_readdir,
.fsync = simple_fsync, .fsync = simple_fsync,
@ -74,8 +74,6 @@ static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
unsigned long n = pos >> PAGE_CACHE_SHIFT; unsigned long n = pos >> PAGE_CACHE_SHIFT;
unsigned long npages = dir_pages(inode); unsigned long npages = dir_pages(inode);
lock_kernel();
pos = (pos + SYSV_DIRSIZE-1) & ~(SYSV_DIRSIZE-1); pos = (pos + SYSV_DIRSIZE-1) & ~(SYSV_DIRSIZE-1);
if (pos >= inode->i_size) if (pos >= inode->i_size)
goto done; goto done;
@ -113,7 +111,6 @@ static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
done: done:
filp->f_pos = ((loff_t)n << PAGE_CACHE_SHIFT) | offset; filp->f_pos = ((loff_t)n << PAGE_CACHE_SHIFT) | offset;
unlock_kernel();
return 0; return 0;
} }

11
fs/sysv/inode.c
View file

@ -21,7 +21,6 @@
* the superblock. * the superblock.
*/ */
#include <linux/smp_lock.h>
#include <linux/highuid.h> #include <linux/highuid.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
@ -37,7 +36,6 @@ static int sysv_sync_fs(struct super_block *sb, int wait)
unsigned long time = get_seconds(), old_time; unsigned long time = get_seconds(), old_time;
lock_super(sb); lock_super(sb);
lock_kernel();
/* /*
* If we are going to write out the super block, * If we are going to write out the super block,
@ -52,7 +50,6 @@ static int sysv_sync_fs(struct super_block *sb, int wait)
mark_buffer_dirty(sbi->s_bh2); mark_buffer_dirty(sbi->s_bh2);
} }
unlock_kernel();
unlock_super(sb); unlock_super(sb);
return 0; return 0;
@ -82,8 +79,6 @@ static void sysv_put_super(struct super_block *sb)
{ {
struct sysv_sb_info *sbi = SYSV_SB(sb); struct sysv_sb_info *sbi = SYSV_SB(sb);
lock_kernel();
if (sb->s_dirt) if (sb->s_dirt)
sysv_write_super(sb); sysv_write_super(sb);
@ -99,8 +94,6 @@ static void sysv_put_super(struct super_block *sb)
brelse(sbi->s_bh2); brelse(sbi->s_bh2);
kfree(sbi); kfree(sbi);
unlock_kernel();
} }
static int sysv_statfs(struct dentry *dentry, struct kstatfs *buf) static int sysv_statfs(struct dentry *dentry, struct kstatfs *buf)
@ -275,7 +268,6 @@ int sysv_write_inode(struct inode *inode, int wait)
return -EIO; return -EIO;
} }
lock_kernel();
raw_inode->i_mode = cpu_to_fs16(sbi, inode->i_mode); raw_inode->i_mode = cpu_to_fs16(sbi, inode->i_mode);
raw_inode->i_uid = cpu_to_fs16(sbi, fs_high2lowuid(inode->i_uid)); raw_inode->i_uid = cpu_to_fs16(sbi, fs_high2lowuid(inode->i_uid));
raw_inode->i_gid = cpu_to_fs16(sbi, fs_high2lowgid(inode->i_gid)); raw_inode->i_gid = cpu_to_fs16(sbi, fs_high2lowgid(inode->i_gid));
@ -291,7 +283,6 @@ int sysv_write_inode(struct inode *inode, int wait)
for (block = 0; block < 10+1+1+1; block++) for (block = 0; block < 10+1+1+1; block++)
write3byte(sbi, (u8 *)&si->i_data[block], write3byte(sbi, (u8 *)&si->i_data[block],
&raw_inode->i_data[3*block]); &raw_inode->i_data[3*block]);
unlock_kernel();
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
if (wait) { if (wait) {
sync_dirty_buffer(bh); sync_dirty_buffer(bh);
@ -315,9 +306,7 @@ static void sysv_delete_inode(struct inode *inode)
truncate_inode_pages(&inode->i_data, 0); truncate_inode_pages(&inode->i_data, 0);
inode->i_size = 0; inode->i_size = 0;
sysv_truncate(inode); sysv_truncate(inode);
lock_kernel();
sysv_free_inode(inode); sysv_free_inode(inode);
unlock_kernel();
} }
static struct kmem_cache *sysv_inode_cachep; static struct kmem_cache *sysv_inode_cachep;