diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-16 23:35:46 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-17 00:36:36 -0400 |
| commit | e7ec952f6aa6ac1649ac49eb5e4de5b92c829d1e (patch) | |
| tree | cfe58a2f9b82ab94bd5ddbbaefb38b4790bdc65c /fs/efs/dir.c | |
| parent | 536c94901eb8f2eb6fccf81ae6be814899a9f6e8 (diff) | |
| download | op-kernel-dev-e7ec952f6aa6ac1649ac49eb5e4de5b92c829d1e.zip op-kernel-dev-e7ec952f6aa6ac1649ac49eb5e4de5b92c829d1e.tar.gz | |
get rid of BKL in fs/efs
Only readdir() really needed it, and that's easily fixable by switch to
generic_file_llseek()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/efs/dir.c')
| -rw-r--r-- | fs/efs/dir.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/efs/dir.c b/fs/efs/dir.c index 49308a2..7ee6f7e3 100644 --- a/fs/efs/dir.c +++ b/fs/efs/dir.c @@ -5,12 +5,12 @@ */ #include <linux/buffer_head.h> -#include <linux/smp_lock.h> #include "efs.h" static int efs_readdir(struct file *, void *, filldir_t); const struct file_operations efs_dir_operations = { + .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = efs_readdir, }; @@ -33,8 +33,6 @@ static int efs_readdir(struct file *filp, void *dirent, filldir_t filldir) { if (inode->i_size & (EFS_DIRBSIZE-1)) printk(KERN_WARNING "EFS: WARNING: readdir(): directory size not a multiple of EFS_DIRBSIZE\n"); - lock_kernel(); - /* work out where this entry can be found */ block = filp->f_pos >> EFS_DIRBSIZE_BITS; @@ -107,7 +105,6 @@ static int efs_readdir(struct file *filp, void *dirent, filldir_t filldir) { filp->f_pos = (block << EFS_DIRBSIZE_BITS) | slot; out: - unlock_kernel(); return 0; } |
