summaryrefslogtreecommitdiffstats
path: root/fs/libfs.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-04-20 19:52:15 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-05-02 19:49:32 -0400
commit4e82901cd6d1af21ae232ae835c36d8230c809e8 (patch)
tree540414489118912197e5a5bf2624adbedec899c4 /fs/libfs.c
parent3125d2650cae97d8f313ab696cd0ed66916e767a (diff)
downloadlinux-4e82901cd6d1af21ae232ae835c36d8230c809e8.tar.gz
linux-4e82901cd6d1af21ae232ae835c36d8230c809e8.tar.bz2
linux-4e82901cd6d1af21ae232ae835c36d8230c809e8.zip
dcache_{readdir,dir_lseek}() users: switch to ->iterate_shared
no need to lock directory in dcache_dir_lseek(), while we are at it - per-struct file exclusion is enough. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/libfs.c')
-rw-r--r--fs/libfs.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/libfs.c b/fs/libfs.c
index 43dd28031a1a..dd8a074482ac 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -89,7 +89,6 @@ EXPORT_SYMBOL(dcache_dir_close);
loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
{
struct dentry *dentry = file->f_path.dentry;
- inode_lock(d_inode(dentry));
switch (whence) {
case 1:
offset += file->f_pos;
@@ -97,7 +96,6 @@ loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
if (offset >= 0)
break;
default:
- inode_unlock(d_inode(dentry));
return -EINVAL;
}
if (offset != file->f_pos) {
@@ -124,7 +122,6 @@ loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
spin_unlock(&dentry->d_lock);
}
}
- inode_unlock(d_inode(dentry));
return offset;
}
EXPORT_SYMBOL(dcache_dir_lseek);
@@ -190,7 +187,7 @@ const struct file_operations simple_dir_operations = {
.release = dcache_dir_close,
.llseek = dcache_dir_lseek,
.read = generic_read_dir,
- .iterate = dcache_readdir,
+ .iterate_shared = dcache_readdir,
.fsync = noop_fsync,
};
EXPORT_SYMBOL(simple_dir_operations);