Commit 81140ca3 authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller

[PATCH] remove lock_kernel() from readdir implementations.

Filesystems which are using generic_file_llseek() do not need lock_kernel()
in their readir implementations.  All operations (including llseek) are
serialised by the directory's i_sem.

Just fix ext2 and ext3 for now.  Others may need locking between readdir and
who-knows-what.
parent 29580832
......@@ -259,8 +259,6 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
int need_revalidate = (filp->f_version != inode->i_version);
int ret = 0;
lock_kernel();
if (pos > inode->i_size - EXT2_DIR_REC_LEN(1))
goto done;
......@@ -313,7 +311,6 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
filp->f_pos = (n << PAGE_CACHE_SHIFT) | offset;
filp->f_version = inode->i_version;
UPDATE_ATIME(inode);
unlock_kernel();
return 0;
}
......@@ -660,6 +657,7 @@ int ext2_empty_dir (struct inode * inode)
}
struct file_operations ext2_dir_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = ext2_readdir,
.ioctl = ext2_ioctl,
......
......@@ -37,6 +37,7 @@ static int ext3_release_dir (struct inode * inode,
struct file * filp);
struct file_operations ext3_dir_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = ext3_readdir, /* we take BKL. needed?*/
.ioctl = ext3_ioctl, /* BKL held */
......@@ -98,16 +99,15 @@ static int ext3_readdir(struct file * filp,
struct super_block * sb;
int err;
struct inode *inode = filp->f_dentry->d_inode;
lock_kernel();
int ret = 0;
sb = inode->i_sb;
if (is_dx(inode)) {
err = ext3_dx_readdir(filp, dirent, filldir);
if (err != ERR_BAD_DX_DIR) {
unlock_kernel();
return err;
ret = err;
goto out;
}
/*
* We don't set the inode dirty flag since it's not
......@@ -186,8 +186,8 @@ static int ext3_readdir(struct file * filp,
filp->f_pos = (filp->f_pos |
(sb->s_blocksize - 1)) + 1;
brelse (bh);
unlock_kernel();
return stored;
ret = stored;
goto out;
}
offset += le16_to_cpu(de->rec_len);
if (le32_to_cpu(de->inode)) {
......@@ -217,8 +217,8 @@ static int ext3_readdir(struct file * filp,
brelse (bh);
}
UPDATE_ATIME(inode);
unlock_kernel();
return 0;
out:
return ret;
}
#ifdef CONFIG_EXT3_INDEX
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment